feat: add workbookComments, presentationComments

* 'develop' of https://github.com/ONLYOFFICE/core:
  OdfFormatReader - data validation (type dropdown list)
  no squares
  fix previous commit
  font by symbol table

.gitignore

@@ -45,3 +45,6 @@ OfficeUtils/win32/OfficeUtilsLib/OfficeUtilsLib/ReadMe.txt
 *.tlb
 *.idb
 **/.hg
+*.zip
+*.tar.gz
+**/*.build/

ASCOfficeDocFile/Common/FormatUtils.h

@@ -501,7 +501,7 @@ namespace DocFileFormat
     
 			facet.widen((char*)bytes, (char*)bytes + size, &result[0]);
 			
-			for (long i=0; i < result.length(); i++)
+			for (size_t i=0; i < result.length(); i++)
 			{
 				STLCollection->push_back(result[i]);
 			}
@@ -536,7 +536,7 @@ namespace DocFileFormat
 					delete [] pStrUtf16;
 					return GetSTLCollectionFromLocale(STLCollection, bytes,size);
 				}
-				for (long i=0; i < nLength; i++)
+				for (unsigned int i = 0; i < nLength; i++)
 				{
 					STLCollection->push_back(pStrUtf16[i]);
 				}
@@ -566,7 +566,7 @@ namespace DocFileFormat
 					delete [] pStrUtf32;
 					return GetSTLCollectionFromLocale(STLCollection, bytes, size);
 				}
-				for (long i=0; i < nLength; i++)
+				for (unsigned int i = 0; i < nLength; i++)
 				{
 					STLCollection->push_back(pStrUtf32[i]);
 				}
@@ -652,7 +652,7 @@ namespace DocFileFormat
 				NSUnicodeConverter::CUnicodeConverter oConverter;
 				std::wstring unicode_string = oConverter.toUnicode((char*)bytes, size, sCodePage.c_str());
 			
-				for (long i=0; i < unicode_string.size(); i++)
+				for (size_t i = 0; i < unicode_string.size(); i++)
 				{
 					STLCollection->push_back(unicode_string[i]);
 				}

ASCOfficeDocFile/Common/XmlTools.h

@@ -393,7 +393,7 @@ namespace XMLTools
 			else
 			{
 				std::string s(m_str.begin(), m_str.end());
-				file.WriteFile((unsigned char*)s.c_str(), s.length());
+				file.WriteFile((unsigned char*)s.c_str(), (DWORD)s.length());
 			}
 			file.CloseFile();
 			return true;

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -321,7 +321,7 @@ namespace DocFileFormat
 
 			case sprmCFtcBi :
 				{//default from FontTable
-					SHORT nIndex	=	FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize);
+					size_t nIndex	=	FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize);
 					if( nIndex < _doc->FontTable->Data.size() )
 					{
 						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
@@ -373,7 +373,7 @@ namespace DocFileFormat
 			case sprmOldCFtc:
 			case sprmCRgFtc0:
 				{	// font family
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+					size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
 					
 					if( nIndex < _doc->FontTable->Data.size() )
 					{
@@ -388,7 +388,8 @@ namespace DocFileFormat
 
 			case sprmCRgFtc1:
 				{
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+					size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+
 					if( nIndex >= 0 && nIndex < _doc->FontTable->Data.size() )
 					{
                         XMLTools::XMLAttribute* eastAsia = new XMLTools::XMLAttribute( L"w:eastAsia" );
@@ -403,7 +404,8 @@ namespace DocFileFormat
 
 			case sprmCRgFtc2:
 				{
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+					size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+
 					if( nIndex>=0 && nIndex < _doc->FontTable->Data.size() )
 					{
                         XMLTools::XMLAttribute* ansi = new XMLTools::XMLAttribute( L"w:hAnsi" );

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -68,12 +68,12 @@ namespace DocFileFormat
 				int cp = m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr;
 
 				size_t count = m_document->AnnotationsReferencePlex->Elements.size();
-				for (unsigned int i = 0; i < count; ++i)
+				for (size_t i = 0; i < count; ++i)
 				{   
 					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
 
                     m_pXmlWriter->WriteNodeBegin( L"w:comment", TRUE );
-                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index ));
+                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 ));
                     m_pXmlWriter->WriteAttribute( L"w:author",
 						FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->GetAuthorIndex() ) ));
                     m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->GetUserInitials());

ASCOfficeDocFile/DocDocxConverter/ContentTypes.h

@@ -69,8 +69,13 @@ namespace OpenXmlContentTypes
     static const wchar_t* Tiff					=	L"image/tiff";
     static const wchar_t* Wmf					=	L"image/x-wmf";
     static const wchar_t* Bmp					=	L"image/bmp";
+	static const wchar_t* Pcz					=	L"image/x-pcz";
+}
+namespace DocPrContentTypes
+{
+    static const wchar_t* App			=	L"application/vnd.openxmlformats-officedocument.extended-properties+xml";
+    static const wchar_t* Core			=	L"application/vnd.openxmlformats-package.core-properties+xml";
 }
-
 namespace WordprocessingMLContentTypes
 {
 	// WordprocessingML content types
@@ -136,7 +141,7 @@ namespace OpenXmlNamespaces
 
 namespace OpenXmlRelationshipTypes
 {
-    static const wchar_t* CoreProperties		=	L"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
+	static const wchar_t* CoreProperties		=	L"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
     static const wchar_t* ExtendedProperties	=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";
 
     static const wchar_t* Theme					=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme";
@@ -157,6 +162,7 @@ namespace OpenXmlRelationshipTypes
     static const wchar_t* OleObject				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
     static const wchar_t* GlossaryDocument		=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument";
     static const wchar_t* Package				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
+    static const wchar_t* VbaProject			=	L"http://schemas.microsoft.com/office/2006/relationships/vbaProject";
 }
 
 namespace MicrosoftWordRelationshipTypes

ASCOfficeDocFile/DocDocxConverter/ConversionContext.h

@@ -47,30 +47,17 @@ namespace DocFileFormat
 
 		virtual ~ConversionContext()
 		{
-
 		}
 
-		// Adds a new RSID to the set
 		inline void AddRsid(const std::wstring& rsid)
 		{
 			if (AllRsids.find(rsid) == AllRsids.end())
 				AllRsids.insert(rsid);
 		}
 
-		inline WordDocument* GetDocument()
-		{
-			return _doc;
-		}
-
-		inline WordprocessingDocument* GetXmlDocument()
-		{
-			return _docx;
-		}
-	
-	public:
 		WordprocessingDocument*		_docx;	
 		WordDocument*				_doc;	
-		/// A set thta contains all revision ids.
+
 		std::set<std::wstring>		AllRsids;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

@@ -63,9 +63,17 @@ namespace DocFileFormat
 {
 	long Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
 	{
+		if (!doc || !docx) return S_FALSE;
+		
 		ConversionContext context( doc, docx );
 
-		//Write styles.xml
+	//Write fontTable.xml
+		if (doc->FontTable)
+		{
+			FontTableMapping fontTableMapping( &context );
+			doc->FontTable->Convert( &fontTableMapping );
+		}
+	//Write styles.xml
 		if (doc->Styles)
 		{
 			StyleSheetMapping styleSheetMapping( &context );
@@ -88,9 +96,7 @@ namespace DocFileFormat
 				return S_FALSE;
 			}
 		}
-
-
-		//Write numbering.xml
+	//Write numbering.xml
 		if (doc->listTable)
 		{
 			NumberingMapping numberingMapping( &context );
@@ -109,14 +115,6 @@ namespace DocFileFormat
 				return S_FALSE;
 			}
 		}
-
-		//Write fontTable.xml
-		if (doc->FontTable)
-		{
-			FontTableMapping fontTableMapping( &context );
-			doc->FontTable->Convert( &fontTableMapping );
-		}
-
 		if ( progress != NULL )
 		{
 			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 875000 );
@@ -130,7 +128,7 @@ namespace DocFileFormat
 			}
 		}
 
-		//write the footnotes
+	//write the footnotes
 		FootnotesMapping footnotesMapping( &context );
 		doc->Convert( &footnotesMapping );
 
@@ -147,7 +145,7 @@ namespace DocFileFormat
 			}
 		}
 
-		//write the endnotes
+	//write the endnotes
 		EndnotesMapping endnotesMapping( &context );
 		doc->Convert( &endnotesMapping );
 
@@ -164,7 +162,7 @@ namespace DocFileFormat
 			}
 		}
 
-		//write the comments
+	//write the comments
 		CommentsMapping commentsMapping( &context );
 		doc->Convert( &commentsMapping );
 
@@ -181,13 +179,13 @@ namespace DocFileFormat
 			}
 		}
 
-		//write settings.xml at last because of the rsid list
+	//write settings.xml at last because of the rsid list
 		if (doc->DocProperties)
 		{
 			SettingsMapping settingsMapping( &context );
 			doc->DocProperties->Convert( &settingsMapping );
 		}
-
+		
 		if ( progress != NULL )
 		{
 			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 975000 );
@@ -204,7 +202,7 @@ namespace DocFileFormat
 		return S_OK;
 	}
 
-	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress)
+	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
 	{
         long result = S_FALSE;
 
@@ -219,7 +217,7 @@ namespace DocFileFormat
 
             if (result == S_OK)
 			{
-				docx.SaveDocument();
+				docx.SaveDocument(bMacros);
 
                 if (progress)progress->OnProgress(progress->caller, DOC_ONPROGRESSEVENT_ID, 1000000);
 

ASCOfficeDocFile/DocDocxConverter/Converter.h

@@ -48,7 +48,7 @@ namespace DocFileFormat
 
 		std::wstring m_sTempFolder;
 
-		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress);
+		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
 	
 	private:
 		long Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -88,7 +88,7 @@ namespace DocFileFormat
 	int DocumentMapping::getCurrentSection(int cp)
 	{
 		//if cp is the last char of a section, the next section will start at cp +1
-		int current = 0;
+		size_t current = 0;
 
 		for (std::vector<int>::iterator iter = m_document->SectionPlex->CharacterPositions.begin() + 1; iter != m_document->SectionPlex->CharacterPositions.end(); ++iter)
 		{
@@ -107,7 +107,7 @@ namespace DocFileFormat
 	{
 		if ( !m_document->ListPlex ) return -1;
 
-		for (int i = 1; i < m_document->ListPlex->CharacterPositions.size(); i++)
+		for (size_t i = 1; i < m_document->ListPlex->CharacterPositions.size(); i++)
 		{
 			if ((fc >= m_document->ListPlex->CharacterPositions[i-1]) && (fc_end <= m_document->ListPlex->CharacterPositions[i]))
 			{
@@ -290,17 +290,15 @@ namespace DocFileFormat
 				std::vector<wchar_t>* chpxChars = m_document->GetChars(fcChpxStart, fcChpxEnd, cp);
 
 				//search for bookmarks in the chars
-				std::vector<int> bookmarks = searchBookmarks(chpxChars, cp);
-
-				//if there are bookmarks in this run, split the run into several runs
-				if (!bookmarks.empty())
+				std::vector<int> annot = searchAnnot(chpxChars, cp);
+				if (!annot.empty())
 				{
-					std::list<std::vector<wchar_t>>* runs = splitCharList(chpxChars, &bookmarks);
+					std::list<std::vector<wchar_t>>* runs = splitCharList(chpxChars, &annot);
 					if (runs) 
 					{
 						for (std::list<std::vector<wchar_t> >::iterator iter = runs->begin(); iter != runs->end(); ++iter)
 						{
-							if (writeBookmarks(cp))
+							if (writeAnnotations(cp))
 							{
 								cp = writeRun(&(*iter), *cpeIter, cp);
 							}
@@ -311,7 +309,30 @@ namespace DocFileFormat
 				}
 				else
 				{
-					cp = writeRun(chpxChars, *cpeIter, cp);
+					//search for bookmarks in the chars
+					std::vector<int> bookmarks = searchBookmarks(chpxChars, cp);
+
+					//if there are bookmarks in this run, split the run into several runs
+					if (!bookmarks.empty())
+					{
+						std::list<std::vector<wchar_t>>* runs = splitCharList(chpxChars, &bookmarks);
+						if (runs) 
+						{
+							for (std::list<std::vector<wchar_t> >::iterator iter = runs->begin(); iter != runs->end(); ++iter)
+							{
+								if (writeBookmarks(cp))
+								{
+									cp = writeRun(&(*iter), *cpeIter, cp);
+								}
+							}
+
+							RELEASEOBJECT(runs);
+						}
+					}
+					else
+					{
+						cp = writeRun(chpxChars, *cpeIter, cp);
+					}
 				}
 
 				RELEASEOBJECT(chpxChars);
@@ -361,7 +382,7 @@ namespace DocFileFormat
 	int DocumentMapping::writeRun (std::vector<wchar_t>* chars, CharacterPropertyExceptions* chpx, int initialCp)
 	{
 		int cp			= initialCp;
-		int result_cp	= cp + chars->size();
+		int result_cp	= cp + (int)chars->size();
 
 		if ((_skipRuns <= 0) && (chars->size() > 0))
 		{
@@ -538,12 +559,12 @@ namespace DocFileFormat
 				m_pXmlWriter->WriteString(elem.GetXMLString());
 			}
 			else if (TextMark::FieldBeginMark == code)
-			{
+			{//todooo в отдельный mapping
 				int cpFieldStart = initialCp + i;
 				int cpFieldEnd = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::FieldEndMark );
 				
 				std::wstring f;
-				if (cpFieldEnd < m_document->Text->size())
+				if (cpFieldEnd < (int)m_document->Text->size())
 					f = std::wstring( ( m_document->Text->begin() + cpFieldStart ), ( m_document->Text->begin() + cpFieldEnd + 1 ) );
 
                 std::wstring EMBED		( L" EMBED" );
@@ -578,20 +599,38 @@ namespace DocFileFormat
 			
 				if ( bFORM )
 				{
-                    m_pXmlWriter->WriteNodeBegin( L"w:fldChar" , true );
+					std::wstring FORMTEXT		( L" FORMTEXT" );
+					std::wstring FORMCHECKBOX	( L" FORMCHECKBOX" );
+					std::wstring FORMDROPDOWN	( L" FORMDROPDOWN" );
+					
+					m_pXmlWriter->WriteNodeBegin( L"w:fldChar" , true );
                     m_pXmlWriter->WriteAttribute( L"w:fldCharType" , L"begin" );
                     m_pXmlWriter->WriteNodeEnd( L"", true, false );
 
-					int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
+					bool bFORMTEXT		= search( f.begin(), f.end(), FORMTEXT.begin(),		FORMTEXT.end())	!= f.end();
+					bool bFORMCHECKBOX	= search( f.begin(), f.end(), FORMCHECKBOX.begin(),	FORMCHECKBOX.end())	!= f.end();
+					bool bFORMDROPDOWN	= search( f.begin(), f.end(), FORMDROPDOWN.begin(),	FORMDROPDOWN.end())	!= f.end();
 
-					/*if (cpPic < cpFieldEnd)
+					if (bFORMTEXT || bFORMCHECKBOX || bFORMDROPDOWN)
 					{
-					int fcPic = _doc.PieceTable.FileCharacterPositions[cpPic];
-					CharacterPropertyExceptions chpxPic = _doc.GetCharacterPropertyExceptions(fcPic, fcPic + 1)[0];
-					NilPicfAndBinData npbd = new NilPicfAndBinData(chpxPic, _doc.DataStream);
-					FormFieldData ffdata = new FormFieldData(npbd.binData);
-					ffdata.Convert(new FormFieldDataMapping(m_pXmlWriter));
-					}*/
+						int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
+						if (cpPic < cpFieldEnd)
+						{
+							int fcPic = m_document->FindFileCharPos( cpPic );
+							std::list<CharacterPropertyExceptions*>* chpxs	= m_document->GetCharacterPropertyExceptions(fcPic, fcPic + 1); 
+
+							if (chpxs)
+							{
+								CharacterPropertyExceptions* chpxSep = chpxs->front();
+								
+								FormFieldData ffdata (2, chpxSep, m_document->DataStream, false);
+								FormFieldDataMapping data_mapping(m_pXmlWriter, m_context, _caller);
+								ffdata.Convert(&data_mapping);
+								
+								RELEASEOBJECT( chpxs );
+							}
+						}
+					}
 
                     m_pXmlWriter->WriteNodeEnd( L"w:fldChar" );
 
@@ -639,11 +678,11 @@ namespace DocFileFormat
 							
 							if (search( f1.begin(),	f1.end(), PAGEREF.begin(), PAGEREF.end()) != f1.end())
 							{
-								int d = f1.find(PAGEREF);
+								int d = (int)f1.find(PAGEREF);
 
 								_writeWebHidden = true;
 								std::wstring _writeTocLink =f1.substr(d + 9);
-                                d = _writeTocLink.find(L" ");
+                                d = (int)_writeTocLink.find(L" ");
 								_writeTocLink = _writeTocLink.substr(0, d);
 								
                                 _writeAfterRun	=	std::wstring (L"<w:hyperlink w:anchor = \"");
@@ -788,6 +827,13 @@ namespace DocFileFormat
 			{
 				if (_fldCharCounter > 0)
 				{
+					if (_writeInstrText == true && !text.empty())
+					{
+						writeTextElement(text, textType);
+						text.clear();
+					}
+					_writeInstrText = false;
+					
                     XMLTools::XMLElement elem( L"w:fldChar" );
                     elem.AppendAttribute( L"w:fldCharType", L"end" );
 
@@ -881,7 +927,7 @@ namespace DocFileFormat
 					{
 						int shape_type = oPicture.shapeContainer->getShapeType();
 
-						if (shape_type != msosptPictureFrame) picture = false;
+						if (shape_type != msosptPictureFrame) picture = false;//шаблон 1.doc картинка в колонтитуле
 					}
 					
 					if (picture)
@@ -948,19 +994,17 @@ namespace DocFileFormat
 			}
 			else if (TextMark::AnnotationReference == code)
 			{
-				if (typeid(*this) != typeid(CommentsMapping))
-				{
-                    m_pXmlWriter->WriteNodeBegin( L"w:commentReference", true );
-                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr ));
-                    m_pXmlWriter->WriteNodeEnd( L"", true );
-				}
-				else
+				if (typeid(*this) == typeid(CommentsMapping))
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:annotationRef", true );
                     m_pXmlWriter->WriteNodeEnd( L"", true );
+				}	
+				else
+				{
+					m_pXmlWriter->WriteNodeBegin( L"w:commentReference", true );
+					m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr ));
+					m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
-
-				_commentNr++;
 			}
 			else if (!FormatUtils::IsControlSymbol(c) && ((int)c != 0xFFFF))
 			{
@@ -1042,6 +1086,30 @@ namespace DocFileFormat
 
 		return ret;
 	}
+	// Searches for bookmarks in the list of characters.
+	std::vector<int> DocumentMapping::searchAnnot(std::vector<wchar_t>* chars, int initialCp)
+	{
+		std::vector<int> ret;
+
+		if (m_document->AnnotStartPlex->IsValid())
+		{
+			int cp = initialCp;
+
+			size_t count = chars->size();
+
+			for (size_t i = 0; i < count; ++i)
+			{
+				if ((m_document->AnnotStartPlex->IsCpExists(cp)) ||	(m_document->AnnotEndPlex->IsCpExists(cp)))
+				{
+					ret.push_back(i);
+				}
+
+				++cp;
+			}
+		}
+
+		return ret;
+	}
 
 	ParagraphPropertyExceptions* DocumentMapping::findValidPapx(int fc)
 	{
@@ -1133,7 +1201,8 @@ namespace DocFileFormat
 		TableInfo tai( papx );
 
 		//build the table grid
-		std::vector<short>* grid = buildTableGrid( cp, nestingLevel );
+		std::vector<short> grid, grid_write;
+		buildTableGrid( cp, nestingLevel, grid, grid_write );
 
 		//find first row end
 		int fcRowEnd = findRowEndFc( cp, nestingLevel );
@@ -1144,7 +1213,7 @@ namespace DocFileFormat
         m_pXmlWriter->WriteNodeBegin( L"w:tbl" );
 
 		//Convert it
-		TablePropertiesMapping *tpMapping = new TablePropertiesMapping( m_pXmlWriter, m_document->Styles, grid );
+		TablePropertiesMapping *tpMapping = new TablePropertiesMapping( m_pXmlWriter, m_document->Styles, &grid, &grid_write );
 
 		row1Tapx.Convert( tpMapping );
 
@@ -1157,7 +1226,7 @@ namespace DocFileFormat
 			//only convert the cells with the given nesting level
 			while ( tai.iTap == nestingLevel )
 			{
-				cp = writeTableRow( cp, grid, nestingLevel );
+				cp = writeTableRow( cp, &grid, &grid_write, nestingLevel );
 				//?fc = m_document->FindFileCharPos(cp );
 				fc = m_document->m_PieceTable->FileCharacterPositions->operator []( cp );
 				papx = findValidPapx( fc );
@@ -1170,7 +1239,7 @@ namespace DocFileFormat
 			//convert until the end of table is reached
 			while ( tai.fInTable )
 			{
-				cp = writeTableRow( cp, grid, nestingLevel );
+				cp = writeTableRow( cp, &grid, &grid_write, nestingLevel );
 				fc = m_document->FindFileCharPos( cp );
 
 				papx = findValidPapx( fc );
@@ -1181,18 +1250,16 @@ namespace DocFileFormat
 		//close w:tbl
         m_pXmlWriter->WriteNodeEnd( L"w:tbl" );
 
-		RELEASEOBJECT( grid );
-
 		return cp;
 	}
 
 	// Builds a list that contains the width of the several columns of the table.
-	std::vector<short>* DocumentMapping::buildTableGrid(int initialCp, unsigned int nestingLevel)
+	bool DocumentMapping::buildTableGrid(int initialCp, unsigned int nestingLevel, std::vector<short>& grid, std::vector<short>& grid_write)
 	{
 		ParagraphPropertyExceptions* backup = _lastValidPapx;
 
 		std::vector<short> boundaries;
-		std::vector<short>* grid = new std::vector<short>();
+		std::vector<short> boundaries_all;
 		
 		int cp = initialCp;
 		int fc = m_document->FindFileCharPos( cp );
@@ -1209,25 +1276,43 @@ namespace DocFileFormat
 			for ( std::list<SinglePropertyModifier>::iterator iter = papx->grpprl->begin(); iter != papx->grpprl->end(); iter++ )
 			{
 				//find the tDef SPRM
-				if ( iter->OpCode == sprmTDefTable ||  iter->OpCode == sprmOldTDefTable)
+				DWORD code = iter->OpCode;
+
+				switch(iter->OpCode)
+				{
+				case sprmTDefTable:
+				case sprmOldTDefTable:
 				{
 					unsigned char itcMac = iter->Arguments[0];
 
-					for (int i = 0; i < itcMac; i++)
+						while(boundaries.size() < itcMac + 1)
+							boundaries.push_back(-0x7fff);
+
+						short boundary0 = -0x7fff;
+						for (unsigned char i = 0; i < itcMac; i++)
 					{
 						short boundary1 = FormatUtils::BytesToInt16( iter->Arguments, 1 + ( i * 2 ), iter->argumentsSize );
+							short boundary2 = FormatUtils::BytesToInt16( iter->Arguments, 1 + ( ( i + 1 ) * 2 ), iter->argumentsSize );
 
-						if ( find( boundaries.begin(), boundaries.end(), boundary1 ) == boundaries.end() )
+							if (boundary2 - boundary1 > 1 && boundary1 - boundary0 > 1)
 						{
-							boundaries.push_back( boundary1 );
+								if ( boundaries[i] == -0x7fff || boundaries[i+1] == -0x7fff)
+								{
+									boundaries[i]	= boundary1;
+									boundaries[i+1]	= boundary2;
+								}
+							}
+							if ( find( boundaries_all.begin(), boundaries_all.end(), boundary1 ) == boundaries_all.end() )
+							{
+								boundaries_all.push_back( boundary1 );
 						}
 
-						short boundary2 = FormatUtils::BytesToInt16( iter->Arguments, 1 + ( ( i + 1 ) * 2 ), iter->argumentsSize );
-
-						if ( find( boundaries.begin(), boundaries.end(), boundary2 ) == boundaries.end() )
+							if ( find( boundaries_all.begin(), boundaries_all.end(), boundary2 ) == boundaries_all.end() )
 						{
-							boundaries.push_back( boundary2 );
+								boundaries_all.push_back( boundary2 );
 						}
+							boundary0 = boundary1;
+						}break;
 					}
 				}
 			}
@@ -1243,19 +1328,25 @@ namespace DocFileFormat
 		}
 
 		//build the grid based on the boundaries
-		sort( boundaries.begin(), boundaries.end() );
+		sort( boundaries_all.begin(), boundaries_all.end() );
 
 		if ( !boundaries.empty() )
 		{
-			for ( unsigned int i = 0; i < ( boundaries.size() - 1 ); i++ )
+			for ( size_t i = 0; i < ( boundaries.size() - 1 ); i++ )
 			{
-				grid->push_back( boundaries[i + 1] - boundaries[i] );
+				grid_write.push_back(  boundaries[i + 1] - boundaries[i] );
+			}
+		}
+		if ( !boundaries_all.empty() )
+		{
+			for ( size_t i = 0; i < ( boundaries_all.size() - 1 ); i++ )
+			{
+				grid.push_back( boundaries_all[i + 1] - boundaries_all[i] );
 			}
 		}
-
 		_lastValidPapx = backup;
 
-		return grid;
+		return true;
 	}
 
 	// Finds the FC of the next row end mark.
@@ -1375,7 +1466,7 @@ namespace DocFileFormat
 	}
 
 	/// Writes the table row that starts at the given cp value and ends at the next row end mark
-	int DocumentMapping::writeTableRow(int initialCp, std::vector<short>* grid, unsigned int nestingLevel)
+	int DocumentMapping::writeTableRow(int initialCp, std::vector<short>* grid, std::vector<short>* grid_write, unsigned int nestingLevel)
 	{
 		int cp = initialCp;
 		int fc = m_document->FindFileCharPos( cp );
@@ -1405,7 +1496,7 @@ namespace DocFileFormat
 			//Write until the first "inner trailer paragraph" is reached
 			while ( !( ( m_document->Text->at( cp ) == TextMark::ParagraphEnd ) && ( tai.fInnerTtp ) ) && tai.fInTable )
 			{
-				cp = writeTableCell( cp, &tapx, grid, gridIndex, cellIndex, nestingLevel );
+				cp = writeTableCell( cp, &tapx, grid, grid_write, gridIndex, cellIndex, nestingLevel );
 				cellIndex++;
 
 				//each cell has it's own PAPX
@@ -1422,7 +1513,7 @@ namespace DocFileFormat
 			while ( !( ( m_document->Text->at( cp ) == TextMark::CellOrRowMark ) && ( tai.fTtp ) ) 
 				&& tai.fInTable )
 			{
-				cp = writeTableCell( cp, &tapx, grid, gridIndex, cellIndex, nestingLevel );
+				cp = writeTableCell( cp, &tapx, grid, grid_write, gridIndex, cellIndex, nestingLevel );
 				cellIndex++;
 
 				//each cell has it's own PAPX
@@ -1445,18 +1536,15 @@ namespace DocFileFormat
 	}
 
 	/// Writes the table cell that starts at the given cp value and ends at the next cell end mark
-	int DocumentMapping::writeTableCell(int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel )  
+	int DocumentMapping::writeTableCell(int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, std::vector<short>* grid_write, int& gridIndex, int cellIndex, unsigned int nestingLevel )  
 	{
 		int cp = initialCp;
+		int cpCellEnd	= findCellEndCp( initialCp, nestingLevel );
 
 		//start w:tc
         m_pXmlWriter->WriteNodeBegin( L"w:tc" );
 
-		//find cell end
-		int cpCellEnd = findCellEndCp( initialCp, nestingLevel );
-
-		//convert the properties
-		TableCellPropertiesMapping* tcpMapping = new TableCellPropertiesMapping( m_pXmlWriter, grid, gridIndex, cellIndex );
+		TableCellPropertiesMapping* tcpMapping = new TableCellPropertiesMapping( m_pXmlWriter, grid, grid_write, gridIndex, cellIndex );
 
 		if ( tapx != NULL )
 		{
@@ -1540,7 +1628,6 @@ namespace DocFileFormat
 		return cpCellEnd;
 	}
 
-	//
 	bool DocumentMapping::writeBookmarks(int cp)
 	{
 		bool result =	true;
@@ -1561,7 +1648,27 @@ namespace DocFileFormat
 
 		return result;
 	}
+	bool DocumentMapping::writeAnnotations(int cp)
+	{
+		bool result =	true;
 
+		for (size_t i = 0; i < m_document->AnnotStartEndCPs.size(); i++)
+		{
+			if (m_document->AnnotStartEndCPs[i].first == cp)
+			{
+				result = writeAnnotationStart(i + 1);
+				_commentNr = i + 1;
+			}
+
+			if (m_document->AnnotStartEndCPs[i].second == cp)
+			{
+				result = writeAnnotationEnd(i + 1);  
+				_commentNr = i + 1;
+			}
+		}
+
+		return result;
+	}
 	bool DocumentMapping::writeBookmarkStart(short id)
 	{
 		// write bookmark start
@@ -1585,8 +1692,6 @@ namespace DocFileFormat
 
 	bool DocumentMapping::writeBookmarkEnd(short id)
 	{
-		// write bookmark end
-		
 		WideString* bookmarkName = static_cast<WideString*>( m_document->BookmarkNames->operator [] ( id ) );
 
         if ( ( bookmarkName != NULL ) && ( *bookmarkName != L"_PictureBullets" ) )
@@ -1602,7 +1707,27 @@ namespace DocFileFormat
 
 		return false;
 	}
+	bool DocumentMapping::writeAnnotationStart(short id)
+	{
+        XMLTools::XMLElement bookmarkElem(L"w:commentRangeStart");
 
+        bookmarkElem.AppendAttribute(L"w:id", FormatUtils::IntToWideString(id));
+
+		m_pXmlWriter->WriteString(bookmarkElem.GetXMLString());
+
+		return true;
+	}
+
+	bool DocumentMapping::writeAnnotationEnd(short id)
+	{
+        XMLTools::XMLElement bookmarkElem( L"w:commentRangeEnd" );
+
+        bookmarkElem.AppendAttribute( L"w:id", FormatUtils::IntToWideString( id ));
+
+		m_pXmlWriter->WriteString( bookmarkElem.GetXMLString()); 
+
+		return true;
+	}
 	// Checks if the CHPX is special
 	bool DocumentMapping::isSpecial(CharacterPropertyExceptions* chpx)
 	{

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -48,6 +48,8 @@
 #include "OleObjectMapping.h"
 #include "ConversionContext.h"
 #include "IMapping.h"
+#include "FormFieldData.h"
+#include "FormFieldDataMapping.h"
 
 namespace DocFileFormat
 {
@@ -99,28 +101,33 @@ namespace DocFileFormat
         void writeTextStart		( const std::wstring& textType, bool preserve_space);
 		void writeTextEnd		( const std::wstring& textType );
 		
-	// Searches for bookmarks in the list of characters.
 		std::vector<int> searchBookmarks( std::vector<wchar_t>* chars, int initialCp );
+		std::vector<int> searchAnnot(std::vector<wchar_t>* chars, int initialCp);
+
 		ParagraphPropertyExceptions* findValidPapx( int fc );
 	// Splits a list of characters into several lists
 		std::list<std::vector<wchar_t> >* splitCharList( std::vector<wchar_t>* chars, std::vector<int>* splitIndices );
 	// Writes the table starts at the given cp value
 		int writeTable		( int initialCp, unsigned int nestingLevel );
 	// Builds a list that contains the width of the several columns of the table.
-		std::vector<short>* buildTableGrid( int initialCp, unsigned int nestingLevel );
+		bool buildTableGrid( int initialCp, unsigned int nestingLevel, std::vector<short>& grid, std::vector<short>& grid_write );
 	// Finds the FC of the next row end mark.
 		int findRowEndFc		( int initialCp, int& rowEndCp, unsigned int nestingLevel );
 	// Finds the FC of the next row end mark.
 		int findRowEndFc		( int initialCp, unsigned int nestingLevel );
 	// Writes the table row that starts at the given cp value and ends at the next row end mark
-		int writeTableRow		( int initialCp, std::vector<short>* grid, unsigned int nestingLevel );
+		int writeTableRow		( int initialCp, std::vector<short>* grid, std::vector<short>* grid_write, unsigned int nestingLevel );
 	// Writes the table cell that starts at the given cp value and ends at the next cell end mark
-		int writeTableCell		( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel );
+		int writeTableCell		( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, std::vector<short>* grid_write, int& gridIndex, int cellIndex, unsigned int nestingLevel );
 		int findCellEndCp		( int initialCp, unsigned int nestingLevel );
 		
 		bool writeBookmarks		( int cp );
 		bool writeBookmarkStart	( short id );
 		bool writeBookmarkEnd	( short id );
+
+		bool writeAnnotations	( int cp );
+		bool writeAnnotationStart( short id );
+		bool writeAnnotationEnd	( short id );
 	// Checks if the CHPX is special
 		bool isSpecial( CharacterPropertyExceptions* chpx );
 	// Finds the SEPX that is valid for the given CP.

ASCOfficeDocFile/DocDocxConverter/FontFamilyName.h

@@ -48,7 +48,8 @@ namespace DocFileFormat
 
   class FontFamilyName: public ByteStructure
   {
-    friend class CharacterPropertiesMapping;
+	friend class WordDocument;
+	friend class CharacterPropertiesMapping;
 	friend class DocumentMapping;
 	friend class FontTableMapping;
 	friend class StyleSheetMapping;

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp

@@ -34,32 +34,30 @@
 
 namespace DocFileFormat
 {
-	FontTableMapping::FontTableMapping( ConversionContext* ctx ): AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() )
+	FontTableMapping::FontTableMapping( ConversionContext* ctx ) : AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() )
 	{
 		_ctx = ctx;
 	}
 
-	/*========================================================================================================*/
 
 	FontTableMapping::~FontTableMapping()
 	{
 		RELEASEOBJECT (m_pXmlWriter);
 	}
 
-	/*========================================================================================================*/
 
 	void FontTableMapping::Apply( IVisitable* visited )
 	{
 		StringTable<FontFamilyName>* table = static_cast<StringTable<FontFamilyName>*>( visited );
 
-		this->_ctx->_docx->RegisterFontTable();
+		_ctx->_docx->RegisterFontTable();
 
         m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
         m_pXmlWriter->WriteNodeBegin( L"w:fonts", TRUE );
         m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
         m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
-		int sz_fonts	= table->Data.size();
+		int sz_fonts = table->Data.size();
 		int users_fonts = 0;
 
 		for ( std::vector<ByteStructure*>::iterator iter = table->Data.begin(); iter != table->Data.end(); iter++ )
@@ -140,6 +138,6 @@ namespace DocFileFormat
 
         m_pXmlWriter->WriteNodeEnd( L"w:fonts");
 
-		this->_ctx->_docx->FontTableXML = std::wstring( m_pXmlWriter->GetXmlString() );
+		_ctx->_docx->FontTableXML = m_pXmlWriter->GetXmlString() ;
 	}
 }

ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h

@@ -75,6 +75,8 @@ namespace DocFileFormat
 
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText ) < (*m_document->IndividualFootnotesPlex)[id + 1] )
 					{
+						int cpStart = cp;
+						
 						int fc =  m_document->FindFileCharPos(cp);
 						if (fc < 0) break;
 
@@ -93,6 +95,8 @@ namespace DocFileFormat
 							//this PAPX is for a normal paragraph
 							cp = writeParagraph( cp );
 						}
+						while (cp <= cpStart)	//conv_fQioC665ib4ngHkDGY4__docx.doc
+							cp++;
 					}
 
                     m_pXmlWriter->WriteNodeEnd( L"w:footnote");

ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp

@@ -0,0 +1,170 @@
+/*
+ * (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 "FormFieldData.h"
+#include "../../Common/DocxFormat/Source/Base/unicode_util.h"
+
+namespace DocFileFormat
+{
+std::wstring readXstz(VirtualStreamReader *reader)
+{
+	if (!reader) return L"";
+
+	unsigned short flags, cch, chTerm;
+
+	cch = reader->ReadUInt16();
+
+	std::wstring ret;
+
+	if (cch > 0)
+	{
+		std::shared_ptr<unsigned char>data = std::shared_ptr<unsigned char>(reader->ReadBytes(cch * 2, true));	
+#if defined(_WIN32) || defined(_WIN64)
+        ret = std::wstring((wchar_t*)data.get(), cch );
+#else
+        ret = convertUtf16ToWString((UTF16*)data.get(), cch );
+#endif
+	}
+	chTerm  = reader->ReadUInt16();
+
+	return ret;
+};
+void FormFieldData::_HFD::read(VirtualStreamReader *reader)
+{
+	if (!reader) return;
+}
+void FormFieldData::_FFData::read(VirtualStreamReader *reader)
+{
+	if (!reader) return;
+
+	bExist = true;
+	
+	unsigned short flags;
+
+	version		= reader->ReadUInt32();
+	flags		= reader->ReadUInt16();
+
+	iType		= GETBITS(flags, 0, 1);
+	iRes		= GETBITS(flags, 2, 6);
+	fOwnHelp	= GETBIT(flags, 7);
+	fOwnStat	= GETBIT(flags, 8);
+	fProt		= GETBIT(flags, 9);
+	iSize		= GETBIT(flags, 10);
+	iTypeTxt	= GETBITS(flags, 11, 13);
+	fRecalc		= GETBIT(flags, 14);
+	fHasListBox = GETBIT(flags, 15);
+
+	cch_field	= reader->ReadUInt16();
+	hps			= reader->ReadUInt16();
+
+	xstzName	= readXstz(reader);
+	xstzTextDef	= readXstz(reader);
+	
+	wDef = reader->ReadUInt16();
+	
+	xstzTextFormat	= readXstz(reader);
+	xstzHelpText	= readXstz(reader);
+	xstzStatText	= readXstz(reader);
+	xstzEntryMcr	= readXstz(reader);
+	xstzExitMcr		= readXstz(reader);
+}
+FormFieldData::FormFieldData( int type, const CharacterPropertyExceptions* chpx, POLE::Stream* stream, bool bOlderVersion_ )
+{
+	binary_data_size = 0;
+
+	if (!chpx) return;
+
+	int fc = -1;
+	bool bNilPICFAndBinData = false;
+
+	for ( std::list<SinglePropertyModifier>::iterator iter = chpx->grpprl->begin(); iter != chpx->grpprl->end(); iter++ )
+	{
+		switch ( iter->OpCode)
+		{
+			case sprmCFSpec:
+			{
+			}
+			break;
+			case sprmCFFldVanish:
+			{
+			}
+			break;
+			case sprmCPicLocation:
+			{
+				fc = FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize );
+			}
+			break;
+			case sprmCRsidText:
+			{
+				rsid = FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt32(iter->Arguments, 0, iter->argumentsSize), L"%08x");
+			}
+			break;
+			case sprmCFData:
+			{
+				bNilPICFAndBinData = true; // or bPICFAndOfficeArtData - shape, pic, ole
+			}
+			break;
+		}
+	}
+
+	if (fc >= 0 && bNilPICFAndBinData)
+	{
+		VirtualStreamReader reader(stream, fc, bOlderVersion_);
+
+		int sz_stream = reader.GetSize();
+
+		int lcb = reader.ReadUInt32();
+		int cbHeader = reader.ReadUInt16();
+
+		if (cbHeader != 0x44) return;
+
+		//ignored
+		reader.ReadBytes(62, false);
+
+		switch(type)
+		{
+		case 1:
+			HFD.read(&reader);
+		case 2:
+			FFData.read(&reader);
+			break;
+		default:
+			binary_data_size = lcb - cbHeader;
+			binary_data = std::shared_ptr<unsigned char>(reader.ReadBytes(binary_data_size, true));
+			break;
+		}
+	}
+}
+
+
+}

ASCOfficeDocFile/DocDocxConverter/FormFieldData.h

@@ -0,0 +1,126 @@
+/*
+ * (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 "IVisitable.h"
+#include "CharacterPropertyExceptions.h"
+#include "StructuredStorageReader.h"
+#include "VirtualStreamReader.h"
+
+namespace DocFileFormat
+{
+	class FormFieldData : public IVisitable
+	{
+ 	public:
+
+		struct _HFD
+		{
+			bool bExist = false;
+
+			bool fNew = false;
+			bool fNoHist = false;
+			bool fImageMap = false;
+			bool fLocation = false;
+			bool fTooltip = false;
+
+			std::wstring clsid;
+			
+			_UINT32	streamVersion = 0;
+			bool	hlstmfHasMoniker = false;
+			bool	hlstmfIsAbsolute = false;
+			bool	hlstmfSiteGaveDisplayName = false;
+			bool	hlstmfHasLocationStr = false;
+			bool	hlstmfHasDisplayName = false;
+			bool	hlstmfHasGUID = false;
+			bool	hlstmfHasCreationTime = false;
+			bool	hlstmfHasFrameName = false;
+			bool	hlstmfMonikerSavedAsStr = false;
+			bool	hlstmfAbsFromGetdataRel = false;
+
+			std::wstring displayName;
+			std::wstring targetFrameName;
+			std::wstring moniker;
+
+			std::wstring	oleMoniker_clsid;
+			std::wstring	oleMoniker_data;
+			std::wstring	location;
+
+			std::wstring	guid;
+			_UINT64			fileTime = 0;
+
+			void read(VirtualStreamReader* reader);
+		};
+		struct _FFData
+		{
+			bool		bExist = false;
+			_UINT32		version = 0;
+			
+			unsigned char	iType = 0;
+			unsigned char	iRes = 0;
+			bool			fOwnHelp = false;
+			bool			fOwnStat = false;
+			bool			fProt = false;
+			bool			iSize = false;
+			unsigned char	iTypeTxt = 0;
+			bool			fRecalc = false;
+			bool			fHasListBox = false;
+			
+			unsigned short	cch_field = 0;
+			unsigned short	hps = 0;
+			std::wstring	xstzName;
+			std::wstring	xstzTextDef;
+			unsigned short	wDef = 0;
+			std::wstring	xstzTextFormat;
+			std::wstring	xstzHelpText;
+			std::wstring	xstzStatText;
+			std::wstring	xstzEntryMcr;
+			std::wstring	xstzExitMcr;
+
+			//STTB			hsttbDropList;
+			void read(VirtualStreamReader* reader);
+		};
+		FormFieldData( int type, const CharacterPropertyExceptions* chpx, POLE::Stream* stream, bool bOlderVersion );
+		virtual ~FormFieldData() {}
+	private:
+		friend class FormFieldDataMapping;  
+
+		std::wstring name;
+		std::wstring rsid;
+
+		_FFData FFData;
+		_HFD	HFD;
+
+		std::shared_ptr<unsigned char> binary_data;
+		int binary_data_size;
+
+};
+}

ASCOfficeDocFile/DocDocxConverter/FormFieldDataMapping.h

@@ -0,0 +1,87 @@
+/*
+ * (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 "ConversionContext.h"
+#include "FormFieldData.h"
+
+#include "AbstractOpenXmlMapping.h"
+#include "IMapping.h"
+
+namespace DocFileFormat
+{
+	class FormFieldDataMapping: public AbstractOpenXmlMapping, public IMapping
+	{
+	public:
+		FormFieldDataMapping(XMLTools::CStringXmlWriter* writer, ConversionContext* context, IMapping* caller) 
+																		: AbstractOpenXmlMapping(writer), m_context(NULL),_caller(NULL)
+		{
+			m_context	=	context;
+			_caller		=	caller;
+		}
+
+		virtual void Apply(IVisitable* visited)
+		{
+			FormFieldData* ffData = static_cast<FormFieldData*>(visited);
+
+			if ( ffData == NULL ) return;
+
+			if (ffData->FFData.bExist)
+			{
+                m_pXmlWriter->WriteNodeBegin( L"w:ffData");
+
+					m_pXmlWriter->WriteNodeBegin( L"w:name", true);
+						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.xstzName);
+					m_pXmlWriter->WriteNodeEnd(L"w:name", true, true );
+					
+					m_pXmlWriter->WriteNodeBegin( L"w:calcOnExit", true);
+						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.fRecalc);
+					m_pXmlWriter->WriteNodeEnd(L"w:calcOnExit", true, true );
+					
+					m_pXmlWriter->WriteNodeBegin( L"w:textInput");
+						
+						m_pXmlWriter->WriteNodeBegin( L"w:maxLength", true);
+							m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.cch_field);
+						m_pXmlWriter->WriteNodeEnd(L"w:maxLength", true, true );
+
+					m_pXmlWriter->WriteNodeEnd( L"w:textInput" );
+
+                m_pXmlWriter->WriteNodeEnd( L"w:ffData" );
+			}
+		}
+
+
+	private:  
+		ConversionContext*	m_context;
+		IMapping*			_caller;
+	};
+}

ASCOfficeDocFile/DocDocxConverter/IVisitable.h

@@ -33,6 +33,9 @@
 
 #include "IMapping.h"
 
+#define GETBITS(from, numL, numH) ((from & (((1 << (numH - numL + 1)) - 1) << numL)) >> numL)
+#define GETBIT(from, num) ((from & (1 << num)) != 0)
+
 namespace DocFileFormat
 {
     class IVisitable

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp

@@ -50,8 +50,7 @@ namespace DocFileFormat
 	void MainDocumentMapping::Apply(IVisitable* visited)
 	{
 		m_document = static_cast<WordDocument*>(visited);
-		m_context->_docx->RegisterDocument();
-
+		
 		// Header
 		m_pXmlWriter->WriteNodeBegin(L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
 		m_pXmlWriter->WriteNodeBegin(L"w:document", TRUE );
@@ -124,11 +123,14 @@ namespace DocFileFormat
 				TableInfo tai(papx);
 				if (tai.fInTable)
 				{
+					int cpStart = cp;
 					//this PAPX is for a table
 					//cp = writeTable( cp, tai.iTap );
 					Table table( this, cp, ( ( tai.iTap > 0 ) ? ( 1 ) : ( 0 ) ) );
 					table.Convert(this);
 					cp = table.GetCPEnd();
+					while (cp <= cpStart)	//conv_eznHsm8em2unSv6_2QE__docx.doc
+						cp++;
 				}
 				else
 				{

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -38,8 +38,8 @@ namespace DocFileFormat
 	{
 		if (m_context)
 		{
-			m_document		=	m_context->GetDocument();
-			m_xmldocument	=	m_context->GetXmlDocument();
+			m_document		=	m_context->_doc;
+			m_xmldocument	=	m_context->_docx;
 		}
 	}
 
@@ -582,7 +582,7 @@ namespace DocFileFormat
 // The style id is used for a reverse reference. 
 // It can happen that the reference points to the wrong style.
 
-		if (styleIndex != ListData::ISTD_NIL)
+		if (styleIndex != ListData::ISTD_NIL && styleIndex < m_document->Styles->Styles->size())
 		{
             m_pXmlWriter->WriteNodeBegin( L"w:pStyle", TRUE );
             m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId(m_document->Styles->Styles->at(styleIndex))));

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreEntry.h

@@ -110,6 +110,11 @@ namespace DocFileFormat
 			unused2		=	Reader->ReadByte();
 			unused3		=	Reader->ReadByte();
 
+			if (btMacOS != btWin32)
+			{
+				btWin32 = btMacOS = (Global::BlipType)this->Instance;
+			}
+
 			if (BodySize > 0x24)
 			{
 				Blip	=	RecordFactory::ReadRecord(Reader, 0);

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/MetafilePictBlip.h

@@ -192,14 +192,14 @@ public:
 	{
 		if (!bIsCompressed)
 		{
-			m_pMetaFile		= pCompress;
-			m_lMetaFileSize = lUncompressSize;
+			m_pMetaFile		= new BYTE[lCompressSize];
+			m_lMetaFileSize = lCompressSize;
+			memcpy(m_pMetaFile, pCompress, lCompressSize);
 		}
 		else
 		{
 			ULONG lSize = lUncompressSize;
 			m_pMetaFile = new BYTE[lUncompressSize];
-            //bool bRes	= NSZLib::Decompress(pCompress, (ULONG)lCompressSize, m_pMetaFile, lSize);
 
 			HRESULT res = S_OK;
 			COfficeUtils* pOfficeUtils = new COfficeUtils(NULL); 
@@ -340,6 +340,8 @@ typedef enum _BlipCompression
 
 			if (typeCode == 0xf01b)
 			{
+				oMetaFile.m_sExtension	= L".wmf";
+				
 				WmfPlaceableFileHeader oWmfHeader = {};
 				oMetaHeader.ToWMFHeader(&oWmfHeader);
 				
@@ -349,24 +351,12 @@ typedef enum _BlipCompression
 
 				oMetaFile.SetHeader(pMetaHeader, lLenHeader);	
 			}
-			
+			if (typeCode == 0xf01c)
+			{
+				oMetaFile.m_sExtension	= L".pcz";
+				//decompress???
+			}
 			oMetaFile.SetData(m_pvBits, oMetaHeader.cbSave, oMetaHeader.cbSize, 0 == oMetaHeader.compression);
-
-			//if (pos < sz)
-			//{
-			//	NSFile::CFileBinary oFile;
-
-			//	if (oFile.CreateFile(L"d:\\blop.dat"))
-			//	{
-			//		BYTE * d = Reader->ReadBytes( sz - pos, true );
-			//		if (d)
-			//		{
-			//			oFile.WriteFile (d, sz - pos);
-			//			delete []d;
-			//			oFile.CloseFile();
-			//		}
-			//	}
-			//}
 		}
 
 		virtual ~MetafilePictBlip()

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h

@@ -53,62 +53,31 @@ namespace DocFileFormat
 
 		PathParser (const unsigned char* pSegmentInfo, unsigned int pSegmentInfoSize, const unsigned char* pVertices, unsigned int pVerticesSize, std::vector<_guides> & guides)
 		{
+			int offset = 6;
+			
 			if ((pSegmentInfo != NULL) && (pSegmentInfoSize > 0))
 			{
-				int offset					=	6;
-
 				unsigned short nElems		=	FormatUtils::BytesToUInt16(pSegmentInfo, 0, pSegmentInfoSize);
 				unsigned short nElemsAlloc	=	FormatUtils::BytesToUInt16(pSegmentInfo, 2, pSegmentInfoSize);
 				unsigned short cb			=	FormatUtils::BytesToUInt16(pSegmentInfo, 4, pSegmentInfoSize);
 				
-				// видимо без шапки сразу пишутся все элементы
-				bool headerIs = ((0xfff0 != cb) && (cb > 8) || nElems > nElemsAlloc);
-				if (headerIs)
-				{	
-					cb		=	2;
-					offset	=	0;
-					nElems	=	pSegmentInfoSize / 2;
+				unsigned short cbElement = 4;
 
-					for (unsigned short i = 0; i < nElems; ++i)
-					{
-						PathSegment oSegment = PathSegment(FormatUtils::BytesToUInt16(pSegmentInfo + offset, (i * cb), pSegmentInfoSize));
-						m_arSegments.push_back (oSegment);
-					}
-				}
-				else
+				if (cb == 0xfff0)
+					cbElement = 2;
+
+				if (nElems == 0)
 				{
-					if ((0xfff0 != cb) && (8 != cb) && (4 != cb) && (2 != cb))
-					{
-						cb		=	0xfff0;
-						offset	=	0;
-						nElems	=	pSegmentInfoSize / 2;
-					}
-
-					if (0xfff0 == cb)	
-					{
-						cb = 4;
-
-						for (unsigned short i = 0; i < nElems; ++i)
-						{
-							PathSegment oSegment = PathSegment(FormatUtils::BytesToUInt16(pSegmentInfo + offset, (i * cb), pSegmentInfoSize));
-							m_arSegments.push_back (oSegment);
-						}
-					}
-					else
-					{
-						if ((2 != cb) && (1 != cb))
-							cb = 8;
-
-						for (unsigned short i = 0; i < nElems; ++i)
-						{
-							PathSegment oSegment = PathSegment(FormatUtils::BytesToInt32(pSegmentInfo + offset, (i * cb), pSegmentInfoSize));
-							m_arSegments.push_back (oSegment);
-						}
-
-						if ((long)pSegmentInfoSize < (long)(cb*nElems))		// Есть несколько файлов с мусором вместо данных
-							m_arSegments.clear();
-					}
+					nElems = (pSegmentInfoSize - offset) / cbElement;
 				}
+				for (unsigned short i = 0; i < nElems; ++i)
+				{
+					PathSegment oSegment = PathSegment(FormatUtils::BytesToInt32(pSegmentInfo + offset, (i * cbElement), pSegmentInfoSize - offset));
+					m_arSegments.push_back (oSegment);
+				}
+
+				if ((long)pSegmentInfoSize < (long)(cb * nElems))		// Есть несколько файлов с мусором вместо данных
+					m_arSegments.clear();
 			}
 
 			if ((NULL != pVertices) && (pVerticesSize > 0))
@@ -117,19 +86,23 @@ namespace DocFileFormat
 				unsigned short nElemsAlloc	=	FormatUtils::BytesToUInt16(pVertices, 2, pVerticesSize);
 				unsigned short cb			=	FormatUtils::BytesToUInt16(pVertices, 4, pVerticesSize);
 
+				unsigned short cbElement = cb;
+
+				if (cb == 0xfff0)
+					cbElement = 4;
+
 				for (unsigned short i = 0; i < nElems; ++i)
 				{				
 					POINT point;	
-					if (0xfff0 == cb)
+					if (cbElement == 4)
 					{
-						cb	=	4;						
-						point.x	= FormatUtils::BytesToInt16(pVertices + 6, (i * cb), pVerticesSize);
-						point.y	= FormatUtils::BytesToInt16(pVertices + 6, (i * cb) + (cb / 2), pVerticesSize);
+						point.x	= FormatUtils::BytesToInt16(pVertices + offset, (i * cbElement), pVerticesSize - offset);
+						point.y	= FormatUtils::BytesToInt16(pVertices + offset, (i * cbElement) + (cbElement / 2), pVerticesSize - offset);
 					}
 					else
 					{
-						point.x	= FormatUtils::BytesToInt32(pVertices + 6, (i * cb), pVerticesSize);
-						point.y	= FormatUtils::BytesToInt32(pVertices + 6, (i * cb) + (cb / 2), pVerticesSize);
+						point.x	= FormatUtils::BytesToInt32(pVertices + offset, (i * cbElement), pVerticesSize - offset);
+						point.y	= FormatUtils::BytesToInt32(pVertices + offset, (i * cbElement) + (cbElement / 2), pVerticesSize - offset);
 					}
 
 					LONG lMinF = (LONG)0x80000000;
@@ -149,7 +122,14 @@ namespace DocFileFormat
 							point.y = guides[index].param3;
 						}
 					}
-
+					if ((size_t)point.y > 0xffff)
+					{
+						point.y &= 0xffff;
+					}
+					if ((size_t)point.x > 0xffff)
+					{
+						point.x &= 0xffff;
+					}
 					m_arPoints.push_back(point);
 				}
 			}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeContainer.h

@@ -63,8 +63,25 @@ namespace DocFileFormat
 				Shape* sh = dynamic_cast<Shape*>( *iter );
 				if (sh)
 				{
-					if (sh->shapeType) return sh->shapeType->GetTypeCode();
-					else return 0;
+					if (sh->shapeType) 
+					{
+						return sh->shapeType->GetTypeCode();
+					}
+					else 
+					{
+						for ( std::vector<Record*>::const_iterator iter1 = this->Children.begin(); iter1 != this->Children.end(); iter1++ )
+						{
+							ShapeOptions* sh_options = dynamic_cast<ShapeOptions*>( *iter1 );
+							if (sh_options)
+							{
+								if (sh_options->OptionsByID.end() != sh_options->OptionsByID.find(Pib))
+								{
+									return msosptPictureFrame;
+								}
+							}
+						}
+						return 0;
+					}
 				}
 			}
 			return 0;

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeOptions.h

@@ -597,16 +597,12 @@ namespace DocFileFormat
 
 		virtual ~ShapeOptions()
 		{
-			//for (std::vector<OptionEntry>::iterator iter = Options.begin(); iter != Options.end(); ++iter)
-			//	RELEASEARRAYOBJECTS( iter->opComplex );
 		}
 
 		ShapeOptions (IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance) : Record (_reader, size, typeCode, version, instance)
 		{
 			long pos = Reader->GetPosition();
 
-			//instance is the count of properties stored in this record
-
 			//parse the flags and the simple values
 			for (unsigned int i = 0; i < instance; ++i)
 			{
@@ -621,9 +617,7 @@ namespace DocFileFormat
 				Options.push_back( entry );
 			}
 
-			//parse the complex values
-			//these values are stored directly at the end  
-			//of the OptionEntry arry, sorted by pid
+			//parse the complex values & sorted by pid
 			for (unsigned int i = 0; i < instance; ++i)
 			{
 				if (Options[i]->fComplex && Options[i]->op > 0)

ASCOfficeDocFile/DocDocxConverter/OleObject.cpp

@@ -46,35 +46,35 @@ OleObject::OleObject( const CharacterPropertyExceptions* chpx, StructuredStorage
 	  
 	HRESULT res = S_OK;
 	
-	POLE::Stream* ObjectPoolStorage = new POLE::Stream(oleStorage, "ObjectPool");
+	POLE::Stream* ObjectPoolStorage = new POLE::Stream(oleStorage, L"ObjectPool");
 
 	if (ObjectPoolStorage)
 	{
 		ObjectId = getOleEntryName( chpx );
 		
-		std::string sObjectId( ObjectId.begin(), ObjectId.end() );
+		std::wstring sObjectId( ObjectId.begin(), ObjectId.end() );
 		{		
-			std::string name = "ObjectPool/" + sObjectId + "/";
-			processOleStream(  name + "Ole"  );
+			std::wstring name = L"ObjectPool/" + sObjectId + L"/";
+			processOleStream(  name + L"Ole"  );
 
 			if ( bLinked )
 			{
-			  processLinkInfoStream( name +  "LinkInfo"  );
+			  processLinkInfoStream( name +  L"LinkInfo"  );
 			}
 			else
 			{
-			  processCompObjStream(  name +  "CompObj"  );
+			  processCompObjStream(  name +  L"CompObj"  );
 			}
 			
-			processPICStream(  name +  "PIC"  );
+			processPICStream(  name +  L"PIC"  );
 
-			processEquationNativeStream(  name +  "Equation Native"  );
+			processEquationNativeStream(  name +  L"Equation Native"  );
 		}
 		delete  ObjectPoolStorage;
 	}
 }
 
-void OleObject::processLinkInfoStream( const std::string& linkStream )
+void OleObject::processLinkInfoStream( const std::wstring& linkStream )
 {
 	try
 	{
@@ -125,7 +125,7 @@ void OleObject::processLinkInfoStream( const std::string& linkStream )
 	}
 }
       
-void OleObject::processEquationNativeStream( const std::string& eqStream )
+void OleObject::processEquationNativeStream( const std::wstring& eqStream )
 {
 	try
 	{
@@ -156,7 +156,7 @@ void OleObject::processEquationNativeStream( const std::string& eqStream )
 	}
 }
 
-void OleObject::processPICStream( const std::string& picStream )
+void OleObject::processPICStream( const std::wstring& picStream )
 {
 	try
 	{
@@ -191,7 +191,7 @@ void OleObject::processPICStream( const std::string& picStream )
 	}
 }
 
-void OleObject::processCompObjStream( const std::string& compStream )
+void OleObject::processCompObjStream( const std::wstring& compStream )
 {
 	try
 	{
@@ -206,11 +206,11 @@ void OleObject::processCompObjStream( const std::string& compStream )
 			//skip the CompObjHeader
 			reader.ReadBytes( 28, false );
 
-			int sz_obj = reader.GetSize() - reader.GetPosition();
+			unsigned int sz_obj = reader.GetSize() - reader.GetPosition();
 
 			if (sz_obj > 4)
 			{
-				UserType		= reader.ReadLengthPrefixedAnsiString(sz_obj);
+				UserType = reader.ReadLengthPrefixedAnsiString(sz_obj);
 
 				sz_obj = reader.GetSize() - reader.GetPosition();
 				if (sz_obj > 4)
@@ -218,7 +218,7 @@ void OleObject::processCompObjStream( const std::string& compStream )
 
 				sz_obj = reader.GetSize() - reader.GetPosition();
 				if (sz_obj > 4)
-					Program			= reader.ReadLengthPrefixedAnsiString(sz_obj);
+					Program = reader.ReadLengthPrefixedAnsiString(sz_obj);
 			}
 			delete pCompStream;
 		}
@@ -228,7 +228,7 @@ void OleObject::processCompObjStream( const std::string& compStream )
 	}
 }
 
-void OleObject::processOleStream( const std::string& oleStreamName )
+void OleObject::processOleStream( const std::wstring& oleStreamName )
 {
 	try
 	{

ASCOfficeDocFile/DocDocxConverter/OleObject.h

@@ -74,11 +74,11 @@ namespace DocFileFormat
 	private:
 		POLE::Storage	*oleStorage;
 	  
-		void processLinkInfoStream		( const std::string& linkStream );      
-		void processEquationNativeStream( const std::string& eqStream );
-		void processPICStream			( const std::string& picStream );
-		void processCompObjStream		( const std::string& compStream );
-		void processOleStream			( const std::string& oleStreamName );
+		void processLinkInfoStream		( const std::wstring& linkStream );      
+		void processEquationNativeStream( const std::wstring& eqStream );
+		void processPICStream			( const std::wstring& picStream );
+		void processCompObjStream		( const std::wstring& compStream );
+		void processOleStream			( const std::wstring& oleStreamName );
 
 		std::wstring getOleEntryName	( const CharacterPropertyExceptions* chpx );
 };

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -43,6 +43,7 @@
 #include "MainDocumentMapping.h"
 #include "OleObjectMapping.h"
 #include "VMLPictureMapping.h"
+#include "FormFieldDataMapping.h"
 
 #include "../../DesktopEditor/common/File.h"
 #include "../../DesktopEditor/common/Directory.h"
@@ -63,6 +64,8 @@ namespace DocFileFormat
         DocumentContentTypesFile._defaultTypes.insert( make_pair( L"xml", std::wstring( OpenXmlContentTypes::Xml ) ) );
 
         MainRelationshipsFile.Relationships.push_back( Relationship( std::wstring( L"rId1"), OpenXmlRelationshipTypes::OfficeDocument, L"word/document.xml") );
+        MainRelationshipsFile.Relationships.push_back( Relationship( std::wstring( L"rId2"), OpenXmlRelationshipTypes::CoreProperties, L"docProps/core.xml") );
+        MainRelationshipsFile.Relationships.push_back( Relationship( std::wstring( L"rId3"), OpenXmlRelationshipTypes::ExtendedProperties, L"docProps/app.xml") );
 	}
 
 
@@ -73,7 +76,6 @@ namespace DocFileFormat
 
         NSDirectory::CreateDirectory( m_strOutputPath + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"_rels" );
 
-
 		WriteRelsFile( DocumentRelationshipsFile );
 
 		WriteRelsFile( FootnotesRelationshipsFile );
@@ -137,15 +139,17 @@ namespace DocFileFormat
 	{
 		NSFile::CFileBinary file;
 		file.CreateFileW(fileName);
-		file.WriteFile((BYTE*)data.c_str(), data.size());
+		file.WriteFile((BYTE*)data.c_str(), (_UINT32)data.size());
 		file.CloseFile();
 		return S_OK;
 	}
 	HRESULT OpenXmlPackage::SaveOLEObject( const std::wstring& fileName, const OleObjectFileStructure& oleObjectFileStructure )
 	{
+		if (docFile == NULL) return S_FALSE;
+
 		POLE::Storage *storageOut = new POLE::Storage(fileName.c_str());
+		if (storageOut == NULL) return S_FALSE;
 		
-		if (storageOut == NULL || docFile == NULL) return S_FALSE;
 		if (storageOut->open(true, true)==false)
 		{	
 			delete storageOut;
@@ -155,20 +159,19 @@ namespace DocFileFormat
 		POLE::Storage *storageInp = docFile->GetStorage()->GetStorage();
 
 		{
-			std::string id(oleObjectFileStructure.objectID.begin(),oleObjectFileStructure.objectID.end());
-
-			POLE::Stream* oleStorage = new POLE::Stream(storageInp, id);
+			POLE::Stream* oleStorage = new POLE::Stream(storageInp, oleObjectFileStructure.objectID);
 
 			if (oleStorage)
 			{
-				std::string path = "ObjectPool/" + id;
-				std::list<std::string> entries = storageInp->entries(path);
-				for (std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++)
+				std::wstring path = L"ObjectPool/" + oleObjectFileStructure.objectID;
+
+				std::list<std::wstring> entries = storageInp->entries(path);
+				for (std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); ++it)
 				{
-					POLE::Stream *stream_inp = new POLE::Stream(storageInp, path + "/"+ (*it));
+					POLE::Stream *stream_inp = new POLE::Stream(storageInp, path + L"/"+ (*it));
 					if (stream_inp == NULL)continue;
 
-					int size = stream_inp->size();
+					POLE::uint64 size = stream_inp->size();
 					
 					POLE::Stream *stream_out = new POLE::Stream(storageOut, *it, true, size);
 
@@ -194,12 +197,23 @@ namespace DocFileFormat
 		delete storageOut;
 		return S_OK;
 	}
-
-	int OpenXmlPackage::RegisterDocument()
+	void OpenXmlPackage::RegisterDocPr()
 	{
-        return AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocument, L"");
+        AddPart( L"docProps", L"app.xml", DocPrContentTypes::App, L"");
+        AddPart( L"docProps", L"core.xml", DocPrContentTypes::Core, L"");
+	}
+	void OpenXmlPackage::RegisterDocument()
+	{
+        AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocument, L"");
+	}
+	void OpenXmlPackage::RegisterDocumentMacros()
+	{
+        AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocumentMacro, L"");
+	}
+	int OpenXmlPackage::RegisterVbaProject()
+	{
+		return AddPart( L"word", L"vbaProject.bin", MicrosoftWordContentTypes::VbaProject, OpenXmlRelationshipTypes::VbaProject );
 	}
-
 	int OpenXmlPackage::RegisterFontTable()
 	{
         return AddPart( L"word", L"fontTable.xml", WordprocessingMLContentTypes::FontTable, OpenXmlRelationshipTypes::FontTable );

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h

@@ -118,6 +118,8 @@ namespace DocFileFormat
 
 	class OpenXmlPackage
 	{
+	public:
+		const WordDocument* docFile;
 	private: 
 		ContentTypesFile DocumentContentTypesFile;
 		RelationshipsFile MainRelationshipsFile;
@@ -137,8 +139,6 @@ namespace DocFileFormat
 		int _footerCounter;
 		int _oleCounter;
 
-		const WordDocument* docFile;
-
         int AddHeaderPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
         int AddFooterPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
         int AddFootnotesPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
@@ -165,7 +165,9 @@ namespace DocFileFormat
 		HRESULT SaveOLEObject		( const std::wstring& fileName, const OleObjectFileStructure& oleObjectFileStructure );
 		HRESULT SaveEmbeddedObject	( const std::wstring& fileName, const std::string& data );
 
-		int RegisterDocument();
+		void RegisterDocPr();
+		void RegisterDocument();
+		void RegisterDocumentMacros();
 		int RegisterFontTable();
 		int RegisterNumbering();
 		int RegisterSettings();
@@ -179,5 +181,6 @@ namespace DocFileFormat
 		int RegisterOLEObject		( const IMapping* mapping, const std::wstring& objectType );
 		int RegisterPackage			( const IMapping* mapping, const std::wstring& objectType);
 		int RegisterExternalOLEObject( const IMapping* mapping, const std::wstring& objectType, const std::wstring& uri );
+		int RegisterVbaProject();
 	};
 }

ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.cpp

@@ -154,7 +154,7 @@ namespace DocFileFormat
 
 				case sprmPFBiDi:
 				{
-					bool val = iter->argumentsSize > 0 ? iter->Arguments[0] : true;
+					bool val = iter->argumentsSize > 0 ? (iter->Arguments[0] != 0) : true;
                     appendFlagElement( _pPr, *iter, L"bidi", val);
 					_isBidi = val;
 				}break;			
@@ -427,7 +427,7 @@ namespace DocFileFormat
 					if (m_document->listTable)
 					{
 						m_document->listTable->appendNumbering(  desc );
-						short numId = m_document->listTable->listNumbering.size();
+						short numId = static_cast<short>(m_document->listTable->listNumbering.size());
                         appendValueElement( &numPr, L"numId", numId, true );
 					}
 				}break;
@@ -485,7 +485,7 @@ namespace DocFileFormat
 				{
                     XMLTools::XMLElement tabs( L"w:tabs" );
 
-					int pos = 0;
+					unsigned int pos = 0;
 
 					//read the removed tabs
 					unsigned char itbdDelMax = iter->Arguments[pos];

ASCOfficeDocFile/DocDocxConverter/PropertiesMapping.cpp

@@ -462,57 +462,60 @@ namespace DocFileFormat
 
     void PropertiesMapping::appendShading( XMLTools::XMLElement* parent, const ShadingDescriptor& desc )
 	{
+		std::wstring pattern = getShadingPattern( desc );
         if ( ( parent != NULL ) && ( desc.shadingSpecialValue == shadingSpecialValueNormal ))
 		{
             XMLTools::XMLElement shd( L"w:shd" );
 
-			//fill color
-            XMLTools::XMLAttribute fill( L"w:fill" );
-
-			if ( desc.shadingType == shadingTypeShd )
-			{
-				if ( desc.cvBackAuto )
-				{
-                    fill.SetValue( L"auto" );
-				}
-				else
-				{
-                    fill.SetValue( RGBColor( (int)desc.cvBack, RedLast ).SixDigitHexCode);
-				}
-			}
-			else
-			{
-                fill.SetValue( FormatUtils::MapValueToWideString( desc.icoBack, &Global::ColorIdentifier[0][0], 17, 12 ));
-			}
-
-			shd.AppendAttribute( fill );
-
-			//foreground color
-            XMLTools::XMLAttribute color( L"w:color" );
-
-			if ( desc.shadingType == shadingTypeShd )
-			{
-				if ( desc.cvForeAuto )
-				{
-                    color.SetValue( L"auto" );
-				}
-				else
-				{
-                    color.SetValue( RGBColor( (int)desc.cvFore, RedLast ).SixDigitHexCode);
-				}
-			}
-			else
-			{
-                color.SetValue( FormatUtils::MapValueToWideString( desc.icoFore, &Global::ColorIdentifier[0][0], 17, 12 ));
-			}
-
-			shd.AppendAttribute( color );
-
 			//pattern
             XMLTools::XMLAttribute val( L"w:val" );
-            val.SetValue( getShadingPattern( desc ));
+            val.SetValue( pattern);
 			shd.AppendAttribute( val );
 
+			if (pattern != L"nil")
+			{
+				//fill color
+				XMLTools::XMLAttribute fill( L"w:fill" );
+
+				if ( desc.shadingType == shadingTypeShd )
+				{
+					if ( desc.cvBackAuto )
+					{
+						fill.SetValue( L"auto" );
+					}
+					else
+					{
+						fill.SetValue( RGBColor( (int)desc.cvBack, RedLast ).SixDigitHexCode);
+					}
+				}
+				else
+				{
+					fill.SetValue( FormatUtils::MapValueToWideString( desc.icoBack, &Global::ColorIdentifier[0][0], 17, 12 ));
+				}
+
+				shd.AppendAttribute( fill );
+
+				//foreground color
+				XMLTools::XMLAttribute color( L"w:color" );
+
+				if ( desc.shadingType == shadingTypeShd )
+				{
+					if ( desc.cvForeAuto )
+					{
+						color.SetValue( L"auto" );
+					}
+					else
+					{
+						color.SetValue( RGBColor( (int)desc.cvFore, RedLast ).SixDigitHexCode);
+					}
+				}
+				else
+				{
+					color.SetValue( FormatUtils::MapValueToWideString( desc.icoFore, &Global::ColorIdentifier[0][0], 17, 12 ));
+				}
+
+				shd.AppendAttribute( color );
+			}
             parent->RemoveChildByName( L"w:shd" );
 			parent->AppendChild( shd );
 		}

ASCOfficeDocFile/DocDocxConverter/RevisionData.cpp

@@ -40,19 +40,13 @@ namespace DocFileFormat
 		RELEASEOBJECT( Changes );
 	}
 
-	/*========================================================================================================*/
-
 	RevisionData::RevisionData():
 	Dttm(), Isbt(0), Type(NoRevision), Changes(NULL), RsidDel(0), RsidProp(0), Rsid(0)
 	{
 		this->Changes = new std::list<SinglePropertyModifier>();
 	}
 
-	/*========================================================================================================*/
-
-	/// Collects the revision data of a CHPX
-	RevisionData::RevisionData( CharacterPropertyExceptions* chpx ):
-	Dttm(), Isbt(0), Type(NoRevision), Changes(NULL), RsidDel(0), RsidProp(0), Rsid(0)
+	RevisionData::RevisionData( CharacterPropertyExceptions* chpx ) : Dttm(), Isbt(0), Type(NoRevision), Changes(NULL), RsidDel(0), RsidProp(0), Rsid(0)
 	{
 		bool collectRevisionData = true;
 		this->Changes = new std::list<SinglePropertyModifier>();

ASCOfficeDocFile/DocDocxConverter/ShadingDescriptor.h

@@ -174,9 +174,9 @@ namespace DocFileFormat
 					//it's a Word 97 SPRM
 					short val	=	FormatUtils::BytesToInt16(bytes, 0, size);
 
-					icoFore		=	(val & 0x1F);						
-					icoBack		=	((val >> 5) & 0x1F);					
-					ipat		=	(ShadingPattern) ((val >> 10) & 0x3F);
+					icoFore		=	GETBITS(val, 0, 4);						
+					icoBack		=	GETBITS(val, 5, 9);						
+					ipat		=	(ShadingPattern) GETBITS(val, 10, 15);	
 
 					shadingType	=	shadingTypeShd80;
 
@@ -209,7 +209,7 @@ namespace DocFileFormat
 						else if (0x0F == icoFore) { cvFore = RGB2 (0x80, 0x80, 0x80); }
 						else if (0x10 == icoFore) { cvFore = RGB2 (0xC0, 0xC0, 0xC0); }
 
-						if (0x00 == icoBack)	{ cvBack = RGB2 (0x00, 0x00, 0x00); cvBackAuto = true; }
+						if (0x00 == icoBack)	{ cvBack = RGB2 (0xFF, 0xFF, 0xFF); cvBackAuto = true; }
 						else if (0x01 == icoBack) { cvBack = RGB2 (0x00, 0x00, 0x00); }
 						else if (0x02 == icoBack) { cvBack = RGB2 (0x00, 0x00, 0xFF); }
 						else if (0x03 == icoBack) { cvBack = RGB2 (0x00, 0xFF, 0xFF); }

ASCOfficeDocFile/DocDocxConverter/SprmTDefTable.h

@@ -41,7 +41,7 @@ namespace DocFileFormat
 	{
 		TC80()
 		{
-			horzMerge = wWidth = 0;
+			wWidth = horzMerge =0;
 			
 			textFlow	=	Global::lrTb;
 			vertMerge	=	Global::fvmClear;
@@ -95,13 +95,14 @@ namespace DocFileFormat
 			int pointer = 1;
 
 			// rgdxaCenter
-
 			for (int i = 0; i < numberOfColumns + 1; ++i)
 			{
-				rgdxaCenter.push_back(FormatUtils::BytesToInt16(bytes, pointer, size));
+				int pos = FormatUtils::BytesToInt16(bytes, pointer, size);
+				rgdxaCenter.push_back(pos);
 				pointer += 2;
 			}
 
+
 			// rgTc80
 
 			for (int i = 0; i < numberOfColumns; ++i)

ASCOfficeDocFile/DocDocxConverter/StringTable.h

@@ -41,6 +41,7 @@ namespace DocFileFormat
 {
 	template<class T> class StringTable: public IVisitable
 	{
+		friend class WordDocument;
 		friend class CharacterPropertiesMapping;
 		friend class FontTableMapping;
 		friend class StyleSheetMapping;	
@@ -81,7 +82,7 @@ namespace DocFileFormat
 			}
 		}
 
-		ByteStructure* operator [] ( unsigned int index ) const
+		ByteStructure* operator [] ( size_t index ) const
 		{
 			if ( index < this->Data.size() )
 			{

ASCOfficeDocFile/DocDocxConverter/StructuredStorageReader.h

@@ -42,7 +42,6 @@ namespace DocFileFormat
 		{
 
 		}
-
 		~StructuredStorageReader()
 		{
 			if(m_pStorage)
@@ -62,12 +61,18 @@ namespace DocFileFormat
 			}
 			return false;
 		}
-
-		bool GetStream (const char *path, POLE::Stream** ppStream)
+		bool isDirectory( const std::wstring& name )
 		{
-			if (( m_pStorage != NULL ) && ( path != NULL ))
+			if (!m_pStorage) return false;
+			
+			return m_pStorage->isDirectory(name);
+		}
+
+		bool GetStream (const std::wstring & path, POLE::Stream** ppStream)
+		{
+			if (( m_pStorage != NULL ) && ( !path.empty() ))
 			{
-				*ppStream = new POLE::Stream(m_pStorage, path);
+				*ppStream = new POLE::Stream(m_pStorage, path.c_str());
 			}
 			if ((*ppStream)  && ((*ppStream)->size() > 0)) 
 				return true;
@@ -79,8 +84,78 @@ namespace DocFileFormat
 		{
 			return m_pStorage;
 		}
+	
+		void copy( int indent, std::wstring path, POLE::Storage * storageOut, bool withRoot = true)
+		{
+			std::list<std::wstring> entries, entries_sort;
+			entries = m_pStorage->entries_with_prefix( path );
+			
+			for( std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); ++it )
+			{
+				std::wstring name = *it;
+				std::wstring fullname = path + name;
+		       
+				if( m_pStorage->isDirectory( fullname ) )
+				{
+					entries_sort.push_back(name);
+				}
+				else
+				{
+					entries_sort.push_front(name);
+				}
+			}
+			//for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); ++it )
+			for( std::list<std::wstring>::iterator it = entries_sort.begin(); it != entries_sort.end(); ++it )
+			{
+				std::wstring name = *it;
+				std::wstring fullname = path + name;
+		       
+				if( m_pStorage->isDirectory( fullname ) )
+				{
+					copy( indent + 1, fullname + L"/", storageOut, withRoot );
+				}
+				else
+				{
+					copy_stream(fullname, storageOut, withRoot);
+				}
+			}
+		}
 
 	private:
+		void copy_stream(std::wstring streamName, POLE::Storage * storageOut, bool withRoot = true)
+		{
+			POLE::Stream *stream = new POLE::Stream(m_pStorage, streamName);
+			if (!stream) return;
+
+			stream->seek(0);
+			POLE::int64 size_stream = stream->size();
+
+			if (withRoot == false)
+			{
+				int pos = (int)streamName.find(L"/");
+				if (pos >= 0)
+					streamName = streamName.substr(pos + 1);
+			}
+			
+			POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, size_stream);
+			if (!streamNew) return;
+
+			unsigned char* data_stream = new unsigned char[size_stream];
+			if (data_stream)
+			{
+				stream->read(data_stream, size_stream);
+
+				streamNew->write(data_stream, size_stream);
+
+				delete []data_stream;
+				data_stream = NULL;
+			}
+
+			streamNew->flush();
+					
+			delete streamNew;
+			delete stream;
+		}
 
 		POLE::Storage* m_pStorage;
 	};

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp

@@ -35,13 +35,13 @@
 
 namespace DocFileFormat
 {
-	TableCellPropertiesMapping::TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* tableGrid, int gridIndex, int cellIndex) : 
+	TableCellPropertiesMapping::TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* grid, const std::vector<short>* grid_write, int gridIndex, int cellIndex) : 
 										PropertiesMapping(pWriter)
 	{
 		_width		=	0;
 
 		_gridIndex	=	gridIndex;
-		_grid		=	tableGrid;
+		_grid		=	grid;
 		_cellIndex	=	cellIndex;
 
 		_brcTop		=	NULL;
@@ -75,6 +75,8 @@ namespace DocFileFormat
 		TablePropertyExceptions* tapx	=	static_cast<TablePropertyExceptions*>(visited);
 		int nComputedCellWidth			=	0;
 
+		_gridSpan = 1;
+
 		std::list<SinglePropertyModifier>::const_reverse_iterator rend = tapx->grpprl->rend();
 		for (std::list<SinglePropertyModifier>::const_reverse_iterator iter = tapx->grpprl->rbegin(); iter != rend; ++iter)
 		{
@@ -87,7 +89,7 @@ namespace DocFileFormat
 					int cc = tdef.numberOfColumns;
 
 					_tGrid = tdef.rgdxaCenter;
-                    _tcDef = tdef.rgTc80[(std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1)];	// NOTE: fix for crash
+                    _tcDef = tdef.rgTc80[(std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1)];	
 
                     appendValueElement( _tcPr, L"textDirection", FormatUtils::MapValueToWideString( _tcDef.textFlow, &Global::TextFlowMap[0][0], 6, 6 ), false );
 
@@ -111,13 +113,19 @@ namespace DocFileFormat
 					{
                         appendValueElement( _tcPr, L"noWrap", L"", true );
 					}
-
-                    nComputedCellWidth = (short)( tdef.rgdxaCenter[(size_t)(std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1) + 1] -
-                        tdef.rgdxaCenter[(std::min)(_cellIndex, (int)tdef.rgTc80.size() - 1)] );	// NOTE: fix for crash
+					int ind = (std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1);
+					int ind1 = ind; 
+					while (ind1 < tdef.rgdxaCenter.size() - 1)
+					{
+						int sz = tdef.rgdxaCenter[ ind1 + 1] - tdef.rgdxaCenter[ ind1 ] ;
+						if (sz > 1)
+							break;
+						ind1++;
+					}
+					nComputedCellWidth = tdef.rgdxaCenter[ ind1 + 1] - tdef.rgdxaCenter[ ind ] ;	
 
 					if (!IsTableBordersDefined(tapx->grpprl))
-					{											//borders
-
+					{
 						RELEASEOBJECT(_brcTop);
 						_brcTop = new BorderCode(*_tcDef.brcTop);
 
@@ -134,8 +142,7 @@ namespace DocFileFormat
 				break;
 
 				case sprmTCellPadding:
-				{							//margins
-
+				{
 					unsigned char first		=	iter->Arguments[0];
 					unsigned char lim		=	iter->Arguments[1];
 					unsigned char ftsMargin	=	iter->Arguments[3];
@@ -165,7 +172,6 @@ namespace DocFileFormat
 					}
 				}
 				break;
-
 				case sprmTDefTableShd80:
 				{
 					if (!tapx->IsSkipShading97())	// если такой операнд единственный то учитываем его, иначе скипаем его
@@ -270,24 +276,23 @@ namespace DocFileFormat
 			}
 		}
 
-		//width
-        XMLTools::XMLElement    tcW     ( L"w:tcW" );
-        XMLTools::XMLAttribute  tcWType ( L"w:type", FormatUtils::MapValueToWideString( _ftsWidth, &Global::CellWidthTypeMap[0][0], 4, 5 ) );
-        XMLTools::XMLAttribute  tcWVal  ( L"w:w", FormatUtils::IntToWideString( _width ) );
+		XMLTools::XMLElement    tcW     ( L"w:tcW" );
+		
 
-        tcW.AppendAttribute( tcWType );
+		XMLTools::XMLAttribute  tcWVal  ( L"w:w", FormatUtils::IntToWideString( _width > 1 ? _width : nComputedCellWidth) );
+		XMLTools::XMLAttribute  tcWType ( L"w:type",  _width > 1 ? FormatUtils::MapValueToWideString( _ftsWidth, &Global::CellWidthTypeMap[0][0], 4, 5 ) : L"dxa" );
+
+		tcW.AppendAttribute( tcWType );
 		tcW.AppendAttribute( tcWVal );
 		_tcPr->AppendChild( tcW );
 
-		//grid span
-		_gridSpan = 1;
 
 		if ( ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidth > _grid->at( _gridIndex ) ) )
 		{
 			//check the number of merged cells
 			int w = _grid->at( _gridIndex );
 
-			for ( unsigned int i = _gridIndex + 1; i < _grid->size(); i++ )
+			for ( size_t i = _gridIndex + 1; i < _grid->size(); i++ )
 			{
 				_gridSpan++;
 
@@ -349,7 +354,7 @@ namespace DocFileFormat
 
 	void TableCellPropertiesMapping::apppendCellShading (unsigned char* sprmArg, int size, int cellIndex)
 	{
-		if (sprmArg)
+		if (sprmArg && cellIndex >= 0)
 		{
 			//shading descriptor can have 10 bytes (Word 2000) or 2 bytes (Word 97)
 			int shdLength = 2;

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.h

@@ -58,7 +58,7 @@ namespace DocFileFormat
 	public:	
 
 		virtual ~TableCellPropertiesMapping();
-		TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* tableGrid, int gridIndex, int cellIndex);
+		TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* grid, const std::vector<short>* grid_write, int gridIndex, int cellIndex);
 		virtual void Apply( IVisitable* visited );
 	
 		inline int GetGridSpan() const
@@ -71,9 +71,7 @@ namespace DocFileFormat
 		void apppendCellShading (unsigned char* sprmArg, int size, int cellIndex);
 		bool IsTableBordersDefined (const std::list<SinglePropertyModifier>* grpprl) const;
 		bool IsTableCellWidthDefined (const std::list<SinglePropertyModifier>* grpprl) const;
-	
-	private: 
-	
+		
 		int _gridIndex;
 		int _cellIndex;
 		
@@ -93,7 +91,6 @@ namespace DocFileFormat
 		BorderCode* _brcRight;
 		BorderCode* _brcBottom;
 
-		/// The grind span of this cell
-		int _gridSpan;
+		int		_gridSpan;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/TableMapping.cpp

@@ -106,7 +106,7 @@ namespace DocFileFormat
 		cellElements.clear();
 	}
 
-	void TableCell::Convert(IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, int& gridIndex, int nCellIndex)
+	void TableCell::Convert(IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, const std::vector<short>* grid_write, int& gridIndex, int nCellIndex)
 	{
 		if (NULL != mapping)
 		{
@@ -116,14 +116,14 @@ namespace DocFileFormat
 		ParagraphPropertyExceptions* papxBackup = documentMapping->_lastValidPapx;
 		SectionPropertyExceptions* sepxBackup	= documentMapping->_lastValidSepx;
 
-		//start w:tc
-        documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tc" );
-
-		//find cell end
+	//find cell end
 		int cpCellEnd = documentMapping->findCellEndCp(cp, depth);
 
-		//convert the properties
-		TableCellPropertiesMapping tcpMapping(documentMapping->GetXMLWriter(), grid, gridIndex, nCellIndex);
+	//start w:tc
+		documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tc" );
+		
+	//convert the properties
+		TableCellPropertiesMapping tcpMapping(documentMapping->GetXMLWriter(), grid, grid_write, gridIndex, nCellIndex);
 
 		if ( tapx != NULL )
 		{
@@ -140,7 +140,7 @@ namespace DocFileFormat
 			(*iter)->Convert( mapping );
 		}
 
-		//end w:tc
+	//end w:tc
         documentMapping->GetXMLWriter()->WriteNodeEnd( L"w:tc" );
 	}
 
@@ -193,7 +193,7 @@ namespace DocFileFormat
 		cells.clear();
 	}
 
-	void TableRow::Convert(IMapping* mapping, const std::vector<short>* grid)
+	void TableRow::Convert(IMapping* mapping, const std::vector<short>* grid, const std::vector<short>* grid_write)
 	{
 		if ( mapping != NULL )
 		{
@@ -234,7 +234,7 @@ namespace DocFileFormat
 			{
 				for ( std::list<TableCell>::iterator iter = cells.begin(); iter != cells.end(); iter++ )
 				{
-					iter->Convert( mapping, &tapx, grid, gridIndex, nCellIndex++ );
+					iter->Convert( mapping, &tapx, grid, grid_write, gridIndex, nCellIndex++);
 				}
 			}
 
@@ -516,7 +516,8 @@ namespace DocFileFormat
 		SectionPropertyExceptions* sepxBackup	=	documentMapping->_lastValidSepx;
 
 		//build the table grid
-		std::vector<short>* grid = documentMapping->buildTableGrid( cpStart, depth );
+		std::vector<short> grid, grid_write;
+		documentMapping->buildTableGrid( cpStart, depth, grid, grid_write );
 
 		//find first row end
 		int fcRowEnd = documentMapping->findRowEndFc( cpStart, depth );
@@ -529,7 +530,7 @@ namespace DocFileFormat
         documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tbl" );
 
 		//Convert it
-		TablePropertiesMapping tpMapping( documentMapping->GetXMLWriter(), documentMapping->m_document->Styles, grid );
+		TablePropertiesMapping tpMapping( documentMapping->GetXMLWriter(), documentMapping->m_document->Styles, &grid, &grid_write );
 
 		row1Tapx.Convert( &tpMapping );
 
@@ -538,13 +539,12 @@ namespace DocFileFormat
 
 		for ( std::list<TableRow>::iterator iter = rows.begin(); iter != rows.end(); iter++ )
 		{
-			iter->Convert( mapping, grid );  
+			iter->Convert( mapping, &grid, &grid_write );  
 		}
 
 		//close w:tbl
         documentMapping->GetXMLWriter()->WriteNodeEnd( L"w:tbl" );
 
-		RELEASEOBJECT( grid );
 	}
 
 }

ASCOfficeDocFile/DocDocxConverter/TableMapping.h

@@ -58,7 +58,7 @@ namespace DocFileFormat
 		void AddItem( const ITableCellElement& _tableCellElement );
 		bool IsEmpty() const;
 		void Clear();
-		void Convert( IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, int& gridIndex, int cellIndex );
+		void Convert( IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, const std::vector<short>* grid_write, int& gridIndex, int cellIndex );
 		~TableCell();
 
 	private:
@@ -81,7 +81,7 @@ namespace DocFileFormat
 		void AddCell( const TableCell& _tableCell );
 		bool IsEmpty() const;
 		void Clear();
-		void Convert( IMapping* mapping, const std::vector<short>* grid );
+		void Convert( IMapping* mapping, const std::vector<short>* grid, const std::vector<short>* grid_write );
 		~TableRow();
 
 	private:

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp

@@ -34,15 +34,13 @@
 
 namespace DocFileFormat
 {
-	TablePropertiesMapping::TablePropertiesMapping (XMLTools::CStringXmlWriter* pWriter, StyleSheet* styles, std::vector<short>* grid, bool isTableStyleNeeded ):
-			PropertiesMapping(pWriter), _tblPr(NULL), _tblGrid(NULL), _tblBorders(NULL), _grid(NULL),
-			brcLeft(NULL), brcTop(NULL), brcBottom(NULL), brcRight(NULL), brcHorz(NULL), brcVert(NULL), _styles(NULL),
+	TablePropertiesMapping::TablePropertiesMapping (XMLTools::CStringXmlWriter* pWriter, StyleSheet* styles, std::vector<short>* grid, std::vector<short>* grid_write, bool isTableStyleNeeded ):
+			PropertiesMapping(pWriter), _tblPr(NULL), _tblGrid(NULL), _tblBorders(NULL), _grid(grid), _grid_write(grid_write),
+			brcLeft(NULL), brcTop(NULL), brcBottom(NULL), brcRight(NULL), brcHorz(NULL), brcVert(NULL), _styles(styles),
 			_isTableStyleNeeded(isTableStyleNeeded)
 {
-	_styles		= styles;
     _tblPr		= new XMLTools::XMLElement( L"w:tblPr");
     _tblBorders = new XMLTools::XMLElement( L"w:tblBorders");
-	_grid		= grid;
 }
 TablePropertiesMapping::~TablePropertiesMapping()
 {
@@ -74,6 +72,9 @@ namespace DocFileFormat
 		short marginLeft	= 0;
 		short marginRight	= 0;
 
+		BYTE itcFirst		= 0;
+		BYTE itcLim			= 0;
+
 		for ( std::list<SinglePropertyModifier>::iterator iter = tapx->grpprl->begin(); iter != tapx->grpprl->end(); iter++ )
 		{
 			switch( iter->OpCode )
@@ -120,7 +121,15 @@ namespace DocFileFormat
 					_tblPr->AppendChild( tblW );
 				}
 				break;
+				case sprmTMerge:
+				{
+					itcFirst = iter->Arguments[0];
+					itcLim = iter->Arguments[1];
+				}break;
+				case sprmTSplit:
+				{
 
+				}break;
 				case sprmOldTJc:
 				case sprmTJc:
 				case sprmTJcRow:
@@ -144,7 +153,7 @@ namespace DocFileFormat
 
 					if ( _isTableStyleNeeded )
 					{
-						int ind = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
+						size_t ind = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
 						
 						std::wstring id = ind < _styles->Styles->size() ? StyleSheetMapping::MakeStyleId( _styles->Styles->at( ind ) ) : L"";
 
@@ -486,7 +495,7 @@ namespace DocFileFormat
 			bWriteGridCol = true;
 		else
 		{
-			for ( unsigned int i = 0, nSize = _grid->size(); i < nSize; i++ )
+			for ( size_t i = 0, nSize = _grid_write->size(); i < nSize; i++ )
 			{
 				if(_grid->at(i) % DocFileFormat::gc_nZeroWidth != 0)
 				{
@@ -497,10 +506,10 @@ namespace DocFileFormat
 		}
 		if(true == bWriteGridCol)
 		{
-			for ( unsigned int i = 0; i < _grid->size(); i++ )		
+			for ( size_t i = 0; i < _grid_write->size(); i++ )		
 			{
                 XMLTools::XMLElement gridCol( L"w:gridCol");
-                XMLTools::XMLAttribute gridColW( L"w:w", FormatUtils::IntToWideString( _grid->at( i ) ) );
+                XMLTools::XMLAttribute gridColW( L"w:w", FormatUtils::IntToWideString( _grid_write->at( i ) ) );
 				gridCol.AppendAttribute( gridColW );
 				_tblGrid->AppendChild( gridCol );
 			}

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.h

@@ -71,7 +71,7 @@ namespace DocFileFormat
 	class TablePropertiesMapping: public PropertiesMapping, public IMapping
 	{
 	public:
-		TablePropertiesMapping( XMLTools::CStringXmlWriter* writer, StyleSheet* styles, std::vector<short>* grid, bool isTableStyleNeeded = true );
+		TablePropertiesMapping( XMLTools::CStringXmlWriter* writer, StyleSheet* styles, std::vector<short>* grid, std::vector<short>* grid_write, bool isTableStyleNeeded = true );
 		virtual ~TablePropertiesMapping();
 		void Apply( IVisitable* visited );
 
@@ -83,6 +83,7 @@ namespace DocFileFormat
 		
 		StyleSheet* _styles;
 		std::vector<short>* _grid;
+		std::vector<short>* _grid_write;
 		
 		BorderCode* brcLeft;
 		BorderCode* brcTop;

ASCOfficeDocFile/DocDocxConverter/TablePropertyExceptions.h

@@ -62,8 +62,9 @@ namespace DocFileFormat
 
 			for (std::list<SinglePropertyModifier>::iterator oSpmIter = papx->grpprl->begin(); oSpmIter != papx->grpprl->end(); ++oSpmIter)
 			{
-				if (oSpmIter->OpCode == sprmTDefTableShd	|| oSpmIter->OpCode == sprmTDefTableShd2nd || 
-					oSpmIter->OpCode == sprmTDefTableShd2nd || oSpmIter->OpCode == sprmTDefTableShd3rd)
+				if (oSpmIter->OpCode == sprmTDefTableShd	|| 
+					oSpmIter->OpCode == sprmTDefTableShd2nd || 
+					oSpmIter->OpCode == sprmTDefTableShd3rd)
 				{
 					m_bSkipShading97 = TRUE;
 				}

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -156,33 +156,35 @@ namespace DocFileFormat
 		file.CloseFile();
 
 		OOX::CPath path(sTempXmlFile);
-		OOX::CDocument docEmbedded(path, path);
+		OOX::CDocument docEmbedded(NULL, path, path);
 
 		bool res = false;
-		for (int i = 0 ; i < docEmbedded.m_arrItems.size(); i++)
+        for (std::vector<OOX::WritingElement*>::iterator it = docEmbedded.m_arrItems.begin(); it != docEmbedded.m_arrItems.end(); ++it)
 		{
-			if (docEmbedded.m_arrItems[i]->getType() == OOX::et_w_p)
+			if ((*it)->getType() == OOX::et_w_p)
 			{
-				OOX::Logic::CParagraph *paragraph = dynamic_cast<OOX::Logic::CParagraph *>(docEmbedded.m_arrItems[i]);
+				OOX::Logic::CParagraph *paragraph = dynamic_cast<OOX::Logic::CParagraph *>(*it);
 
-				for (int j = 0; (paragraph) && (j < paragraph->m_arrItems.size()); j++)
+                for (std::vector<OOX::WritingElement*>::iterator		jt = paragraph->m_arrItems.begin();
+													(paragraph) && (jt != paragraph->m_arrItems.end()); jt++)
 				{
-					if (paragraph->m_arrItems[j]->getType() == OOX::et_m_oMath)
+					if ((*jt)->getType() == OOX::et_m_oMath)
 					{
 						res = true;
-                        newXmlString = paragraph->m_arrItems[j]->toXML();
+                        newXmlString = (*jt)->toXML();
 						break;
 					}
-					else if (paragraph->m_arrItems[j]->getType() == OOX::et_m_oMathPara)
+					else if ((*jt)->getType() == OOX::et_m_oMathPara)
 					{
-						OOX::Logic::COMathPara *mathPara = dynamic_cast<OOX::Logic::COMathPara *>(paragraph->m_arrItems[j]);
+						OOX::Logic::COMathPara *mathPara = dynamic_cast<OOX::Logic::COMathPara *>(*jt);
 						
-						for (int k = 0; (mathPara) && (k < mathPara->m_arrItems.size()); k++)
+                        for (std::vector<OOX::WritingElement*>::iterator kt = mathPara->m_arrItems.begin();
+														(mathPara) && (kt != mathPara->m_arrItems.end()); kt++)
 						{
-							if (mathPara->m_arrItems[k]->getType() == OOX::et_m_oMath)
+							if ((*kt)->getType() == OOX::et_m_oMath)
 							{
 								res = true;
-                                newXmlString = mathPara->m_arrItems[k]->toXML();
+                                newXmlString = (*kt)->toXML();
 								break;
 							}
 						}
@@ -498,6 +500,7 @@ namespace DocFileFormat
 			{
 				case Global::msoblipEMF:
 				case Global::msoblipWMF:
+				case Global::msoblipPICT:
 				{
 					MetafilePictBlip* metaBlip = static_cast<MetafilePictBlip*>(oBlipEntry->Blip);
 					if (metaBlip)
@@ -565,6 +568,9 @@ namespace DocFileFormat
 		case Global::msoblipWMF:
 			return std::wstring(L".wmf");
 
+		case Global::msoblipPICT:
+			return std::wstring(L".pcz");
+
 		default:
 			return std::wstring(L".png");
 		}
@@ -599,6 +605,9 @@ namespace DocFileFormat
 		case Global::msoblipWMF:
 			return std::wstring(OpenXmlContentTypes::Wmf);
 
+		case Global::msoblipPICT:
+			return std::wstring(OpenXmlContentTypes::Pcz);
+
 		case Global::msoblipDIB:
 			return std::wstring(OpenXmlContentTypes::Bmp);
 		

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -288,6 +288,7 @@ namespace DocFileFormat
 		int ndyTextBottom		=	-1;
 
 		bool bHavePath			=	false;
+		int nShapePath			=	-1;
 		int	nAdjValues			=	0;
 		int	nLTxID				=	-1;
 
@@ -361,6 +362,7 @@ namespace DocFileFormat
 			case shapePath :
 				{
 					bHavePath =	true;
+					nShapePath = iter->op;
 				}break;
 			case pVertices:
 				{
@@ -744,7 +746,7 @@ namespace DocFileFormat
 
 					text = FormatUtils::XmlEncode(text);
 
-					if (0 <= text.find(L"\n"))
+					if (std::wstring::npos != text.find(L"\n"))
 					{
 						m_textpath.AppendText(text);
 					}
@@ -754,7 +756,7 @@ namespace DocFileFormat
 			case gtextFont:
 				{
 					std::wstring font = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex.get(), (iter->op)/2);
-					int i = font.size();
+					size_t i = font.size();
 					while (i > 0)
 					{
 						if (font[i-1] != 0) break;
@@ -1285,6 +1287,7 @@ namespace DocFileFormat
 			{
 			case Global::msoblipEMF:
 			case Global::msoblipWMF:
+			case Global::msoblipPICT:
 				{
 					//it's a meta image
 					MetafilePictBlip* metaBlip = static_cast<MetafilePictBlip*>(RecordFactory::ReadRecord(&reader, 0));
@@ -1371,6 +1374,9 @@ namespace DocFileFormat
 			case Global::msoblipWMF:
 				return std::wstring( L".wmf" );
 
+			case Global::msoblipPICT:
+				return std::wstring( L".pcz" );
+
 			default:
 				return std::wstring( L".png" );
 		}
@@ -1653,7 +1659,7 @@ namespace DocFileFormat
 		}
 		if (!bRelV && m_pSpa)
 		{
-			appendStyleProperty(oStyle, L"mso-position-vertical-relative", mapVerticalPositionRelative(m_pSpa->bx));
+			appendStyleProperty(oStyle, L"mso-position-vertical-relative", mapVerticalPositionRelative(m_pSpa->by));
 		}
 		if (!m_isInlineShape && !bZIndex)
 		{
@@ -1905,13 +1911,13 @@ namespace DocFileFormat
 			switch (pSpa->wr)
 			{
 				case 0:
-				case 2:	wrapType = L"square";
-				case 1:	wrapType = L"topAndBottom";
-				case 3:	wrapType = L"through";
+				case 2:	wrapType = L"square";		break;
+				case 1:	wrapType = L"topAndBottom";	break;
+				case 3:	wrapType = L"through";		break;
 				case 4:
-				case 5:	wrapType = L"tight";
+				case 5:	wrapType = L"tight";		break;
 				default:
-						wrapType = L"none";
+						wrapType = L"none";			break;
 			}
 		}
 
@@ -1963,7 +1969,7 @@ namespace DocFileFormat
         {
             int index = (DWORD)val - 0x80000000;
 		
-			if (index >= 0 && index < m_arrGuides.size())
+			if (index >= 0 && index < (int)m_arrGuides.size())
 			{
 				new_val = m_arrGuides[index].param3;
 			}
@@ -2087,6 +2093,7 @@ namespace DocFileFormat
             nElemSize = 4;
             bTruncated = true;
         }
+        else nElemSize = 2;
 
         long dwSize = nElems * nElemSize;
 
@@ -2129,7 +2136,7 @@ namespace DocFileFormat
 	
 	void VMLShapeMapping::ApplyPrimitives(DrawingPrimitives * primitives)
 	{
-		int index = 0;
+		size_t index = 0;
 
 		while(true)
 		{
@@ -2141,7 +2148,7 @@ namespace DocFileFormat
 
 	static int currentTextBoxIndex = 1;
 	
-	int VMLShapeMapping::ApplyPrimitive(DrawingPrimitives * primitives, int index)
+	size_t VMLShapeMapping::ApplyPrimitive(DrawingPrimitives * primitives, size_t index)
 	{
 		if (!primitives) return index++;
 		if (index >= primitives->size()) return index++;
@@ -2240,11 +2247,11 @@ namespace DocFileFormat
 			{
 				//strStyle += L"left:"		+ FormatUtils::IntToWideString( x.ToPoints()) + L"pt;";
 				//strStyle += L"top:"		+ FormatUtils::IntToWideString( y.ToPoints()) + L"pt;";
-				strStyle +=	L"width:"		+ FormatUtils::IntToWideString( w.ToPoints()) + L"pt;";
-				strStyle +=	L"height:"		+ FormatUtils::IntToWideString( h.ToPoints()) + L"pt;";
+				strStyle +=	L"width:"		+ FormatUtils::IntToWideString( (int)w.ToPoints()) + L"pt;";
+				strStyle +=	L"height:"		+ FormatUtils::IntToWideString( (int)h.ToPoints()) + L"pt;";
 
-				strStyle += L"margin-left:"	+ FormatUtils::IntToWideString( x.ToPoints()) + L"pt;";
-				strStyle +=	L"margin-top:"	+ FormatUtils::IntToWideString( y.ToPoints()) + L"pt;";
+				strStyle += L"margin-left:"	+ FormatUtils::IntToWideString( (int)x.ToPoints()) + L"pt;";
+				strStyle +=	L"margin-top:"	+ FormatUtils::IntToWideString( (int)y.ToPoints()) + L"pt;";
 
 				std::wstring xMargin;
 				std::wstring yMargin;

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.h

@@ -73,7 +73,7 @@ namespace DocFileFormat
 	private:
 
 		void ApplyPrimitives	(DrawingPrimitives	* primitives );
-		int  ApplyPrimitive		(DrawingPrimitives	* primitives, int index);
+		size_t  ApplyPrimitive	(DrawingPrimitives	* primitives, size_t index);
 
 		void WritePrimitiveProps(DrawingPrimitive	* primitive, bool root);
 

ASCOfficeDocFile/DocDocxConverter/VirtualStreamReader.h

@@ -134,7 +134,7 @@ public:
 			if (position + count > stream->size())
 			{
 				if (position > stream->size())	count = 0;
-				else							count = stream->size() - position;
+				else							count = (unsigned int)(stream->size() - position);
 			}
 			rdBytes = new unsigned char[count];
 		}
@@ -152,7 +152,7 @@ public:
 
 	virtual unsigned long GetPosition() const
 	{
-		return this->position;
+		return (unsigned long)this->position;
 	}
 
 	virtual unsigned long GetSize() const
@@ -161,7 +161,7 @@ public:
 
 		if ( stream != NULL )
 		{
-			size = stream->size();
+			size = (unsigned long)stream->size();
 		}
 
 		return size;
@@ -246,7 +246,7 @@ public:
 	/// The string must have the following structure:
 	/// unsigned char 1-4: Character count (cch)
 	/// unsigned char 5-cch+4:   ANSI characters terminated by \0
-	std::wstring ReadLengthPrefixedAnsiString(int max_size)
+	std::wstring ReadLengthPrefixedAnsiString(unsigned int max_size)
 	{
 		std::wstring result;
 
@@ -257,8 +257,8 @@ public:
 		if (cch > max_size)
 		{
 			//error ... skip to 0
-			int pos_orinal = GetPosition();
-			int pos = 0;
+			unsigned int pos_orinal = GetPosition();
+			unsigned int pos = 0;
 		
 			stringBytes = ReadBytes( max_size, true );
 

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -40,8 +40,45 @@
 #include "../../DesktopEditor/common/File.h"
 #include "../../DesktopEditor/common/Directory.h"
 
+#include <unordered_map>
+
 namespace DocFileFormat
 {
+	static const int aCodePages[][2] = {
+		//charset	codepage
+		0,	1252, //ANSI
+		1,	0,//Default
+		2,	42,//Symbol
+		77,	10000,//Mac Roman
+		78,	10001,//Mac Shift Jis
+		79,	10003,//Mac Hangul
+		80,	10008,//Mac GB2312
+		81,	10002,//Mac Big5
+		83,	10005,//Mac Hebrew
+		84,	10004,//Mac Arabic
+		85,	10006,//Mac Greek
+		86,	10081,//Mac Turkish
+		87,	10021,//Mac Thai
+		88,	10029,//Mac East Europe
+		89,	10007,//Mac Russian
+		128,	932,//Shift JIS
+		129,	949,//Hangul
+		130,	1361,//Johab
+		134,	936,//GB2312
+		136,	950,//Big5
+		238,	1250,//Greek
+		161,	1253,//Greek
+		162,	1254,//Turkish
+		163,	1258,//Vietnamese
+		177,	1255,//Hebrew
+		178,	1256, //Arabic
+		186,	1257,//Baltic
+		204,	1251,//Russian
+		222,	874,//Thai
+		238,	1250,//Eastern European
+		254,	437,//PC 437
+		255,	850//OEM
+	};
 	WordDocument::WordDocument (const ProgressCallback* pCallFunc, const std::wstring & sTempFolder ) :	
 		m_PieceTable(NULL), WordDocumentStream(NULL), TableStream(NULL), DataStream(NULL),  FIB(NULL), 
 		Text(NULL), RevisionAuthorTable(NULL), FontTable(NULL), BookmarkNames(NULL), AutoTextNames(NULL), 
@@ -52,14 +89,18 @@ namespace DocFileFormat
 		TextboxIndividualPlex(NULL),AssocNames(NULL), BookmarkAnnotNames(NULL), Captions(NULL), AutoCaptions(NULL), ListPlex(NULL),
 		OfficeDrawingPlex(NULL), OfficeDrawingPlexHeader(NULL), SectionPlex(NULL), BookmarkStartPlex(NULL), BookmarkEndPlex(NULL),
 		AutoTextPlex(NULL), AllPapxFkps(NULL), AllChpxFkps(NULL), AllPapx(NULL), AllPapxVector(NULL), AllSepx(NULL), Styles(NULL), listTable(NULL),
-		AnnotationOwners(NULL), DocProperties(NULL), listFormatOverrideTable(NULL), headerAndFooterTable(NULL), encryptionHeader(NULL)
+		AnnotationOwners(NULL), DocProperties(NULL), listFormatOverrideTable(NULL), headerAndFooterTable(NULL),
+		AnnotStartPlex(NULL), AnnotEndPlex(NULL), encryptionHeader(NULL)
 	{
-		m_pCallFunc			=	pCallFunc;	
-		m_sTempFolder		=	sTempFolder;
+		m_pCallFunc			= pCallFunc;	
+		m_sTempFolder		= sTempFolder;
 		
-		m_pStorage			=	NULL;
-		officeArtContent	=	NULL;
-		bOlderVersion		=	false;
+		m_pStorage			= NULL;
+		officeArtContent	= NULL;
+		bOlderVersion		= false;
+		
+		bDocumentCodePage	= false;
+		nDocumentCodePage	= ENCODING_WINDOWS_1250;
 	}
 
 	WordDocument::~WordDocument()
@@ -94,7 +135,7 @@ namespace DocFileFormat
             return AVS_ERROR_FILEFORMAT;
 		}
 //-----------------------------------------------------------------------------------------------------------------
-		if (m_pStorage->GetStream ("WordDocument", &WordDocumentStream) == false)
+		if (m_pStorage->GetStream (L"WordDocument", &WordDocumentStream) == false)
 		{
 			Clear();
             return AVS_ERROR_FILEFORMAT;
@@ -120,16 +161,16 @@ namespace DocFileFormat
 
 		if (FIB->m_FibBase.fWhichTblStm)
 		{
-			if (!m_pStorage->GetStream ("1Table", &TableStream))
+			if (!m_pStorage->GetStream (L"1Table", &TableStream))
 			{
-				res	=	m_pStorage->GetStream ("0Table", &TableStream);
+				res	=	m_pStorage->GetStream (L"0Table", &TableStream);
 			}
 		}
 		else
 		{
-			if (!m_pStorage->GetStream ("0Table", &TableStream))
+			if (!m_pStorage->GetStream (L"0Table", &TableStream))
 			{
-				res	=	m_pStorage->GetStream ("1Table", &TableStream);
+				res	=	m_pStorage->GetStream (L"1Table", &TableStream);
 			}
 		}
 
@@ -175,10 +216,8 @@ namespace DocFileFormat
 		POLE::Stream			* Summary		= NULL;
 		POLE::Stream			* DocSummary	= NULL;
 		
-		m_pStorage->GetStream ("SummaryInformation",			&Summary);
-		m_pStorage->GetStream ("DocumentSummaryInformation",	&DocSummary);
-
-		document_code_page = ENCODING_WINDOWS_1250;
+		m_pStorage->GetStream (L"SummaryInformation",			&Summary);
+		m_pStorage->GetStream (L"DocumentSummaryInformation",	&DocSummary);
 		
 		if ((Summary) && (Summary->size() > 0))
 		{
@@ -187,7 +226,10 @@ namespace DocFileFormat
 			int document_code_page1 = summary_info.GetCodePage(); //from software last open 
 			
 			if (document_code_page1 > 0)
-				document_code_page = document_code_page1;		
+			{
+				nDocumentCodePage = document_code_page1;		
+				bDocumentCodePage = true;
+			}
 		}
 		if ((DocSummary) && (DocSummary->size() > 0))
 		{
@@ -196,16 +238,22 @@ namespace DocFileFormat
 			int document_code_page2 = doc_summary_info.GetCodePage();
 
 			if (document_code_page2 > 0)
-				document_code_page = document_code_page2;
+			{
+				nDocumentCodePage = document_code_page2;
+				bDocumentCodePage = true;
+			}
 		}
 		if (!bOlderVersion)
-			document_code_page = ENCODING_UTF16;
+		{
+			nDocumentCodePage = ENCODING_UTF16;
+			bDocumentCodePage = true;
+		}
 
-		FIB->m_CodePage =  document_code_page;
+		FIB->m_CodePage =  nDocumentCodePage;
 //-------------------------------------------------------------------------------------------------
 		try
 		{
-			m_pStorage->GetStream ("Data", &DataStream);
+			m_pStorage->GetStream (L"Data", &DataStream);
 		}
 		catch (...)
 		{
@@ -215,7 +263,7 @@ namespace DocFileFormat
 		if (TableStream->size() < 1 && bOlderVersion)
 		{
 			RELEASEOBJECT(TableStream);
-			m_pStorage->GetStream ("WordDocument", &TableStream);
+			m_pStorage->GetStream (L"WordDocument", &TableStream);
 		}
 
 		RevisionAuthorTable	=	new StringTable<WideString>		(TableStream, FIB->m_FibWord97.fcSttbfRMark,		FIB->m_FibWord97.lcbSttbfRMark,			bOlderVersion);
@@ -275,12 +323,17 @@ namespace DocFileFormat
 		TextboxIndividualPlex				=	new Plex<FTXBXS>			(FTXBXS::STRUCTURE_SIZE,			TableStream, FIB->m_FibWord97.fcPlcftxbxTxt,	FIB->m_FibWord97.lcbPlcftxbxTxt,	bOlderVersion);
 
 		SectionPlex							=	new Plex<SectionDescriptor>	(SectionDescriptor::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfSed,		FIB->m_FibWord97.lcbPlcfSed,		bOlderVersion);
+		
 		BookmarkStartPlex					=	new Plex<BookmarkFirst>		(BookmarkFirst::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfBkf,		FIB->m_FibWord97.lcbPlcfBkf,		bOlderVersion);
 		BookmarkEndPlex						=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfBkl,		FIB->m_FibWord97.lcbPlcfBkl,		bOlderVersion);
 
 		TextboxBreakPlex					=	new Plex<Tbkd>				(Tbkd::STRUCTURE_SIZE,				TableStream, FIB->m_FibWord97.fcPlcfTxbxBkd,	FIB->m_FibWord97.lcbPlcfTxbxBkd,	bOlderVersion);
 		TextboxBreakPlexHeader				=	new Plex<Tbkd>				(Tbkd::STRUCTURE_SIZE,				TableStream, FIB->m_FibWord97.fcPlcfTxbxHdrBkd, FIB->m_FibWord97.lcbPlcfTxbxHdrBkd, bOlderVersion);
 
+		AnnotStartPlex						=	new Plex<BookmarkFirst>		(BookmarkFirst::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfAtnBkf,		FIB->m_FibWord97.lcbPlcfAtnBkf,		bOlderVersion);
+		AnnotEndPlex							=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfAtnBkl,		FIB->m_FibWord97.lcbPlcfAtnBkl,		bOlderVersion);
+		
+
 		for (size_t i = 0; i < BookmarkStartPlex->Elements.size(); ++i)
 		{
 			BookmarkFirst* pBookmark		=	static_cast<BookmarkFirst*>(BookmarkStartPlex->Elements[i]);
@@ -289,7 +342,14 @@ namespace DocFileFormat
 				BookmarkStartEndCPs.push_back(std::make_pair(BookmarkStartPlex->CharacterPositions[i], BookmarkEndPlex->CharacterPositions[pBookmark->GetIndex()]));
 			}
 		}
-
+		for (size_t i = 0; i < AnnotStartPlex->Elements.size(); ++i)
+		{
+			BookmarkFirst* pBookmark		=	static_cast<BookmarkFirst*>(AnnotStartPlex->Elements[i]);
+			if (pBookmark)
+			{
+				AnnotStartEndCPs.push_back(std::make_pair(AnnotStartPlex->CharacterPositions[i], AnnotEndPlex->CharacterPositions[pBookmark->GetIndex()]));
+			}
+		}
 		AutoTextPlex						=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfGlsy,   FIB->m_FibWord97.lcbPlcfGlsy, bOlderVersion);
 		FieldsPlex							=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldMom, FIB->m_FibWord97.lcbPlcfFldMom, bOlderVersion);
 		FootnoteDocumentFieldsPlex			=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldFtn, FIB->m_FibWord97.lcbPlcfFldFtn, bOlderVersion);
@@ -340,6 +400,31 @@ namespace DocFileFormat
 				return AVS_ERROR_FILEFORMAT;
 			}
 		}
+		if (!bDocumentCodePage && FontTable)
+		{
+			std::unordered_map<int, int> fonts_charsets;
+
+			for ( std::vector<ByteStructure*>::iterator iter = FontTable->Data.begin();!bDocumentCodePage &&  iter != FontTable->Data.end(); iter++ )
+			{
+				FontFamilyName* font = dynamic_cast<FontFamilyName*>( *iter );
+				if (!font) continue;
+
+				if (fonts_charsets.find(font->chs) == fonts_charsets.end())
+				{
+					fonts_charsets.insert(std::make_pair(font->chs, font->ff));
+					
+					for (int i = 0 ; i < sizeof(aCodePages) / 2; i++)
+					{
+						if (aCodePages[i][0] == font->chs && font->chs != 0)
+						{
+							nDocumentCodePage = aCodePages[i][1];
+							bDocumentCodePage = true;
+							break;
+						}
+					}	
+				}
+			}
+		}
 
 		if (FIB->m_FibWord97.lcbClx > 0)
 		{
@@ -358,7 +443,7 @@ namespace DocFileFormat
 			WordDocumentStream->read (bytes, cb);
 
 			Text = new std::vector<wchar_t>();
-			FormatUtils::GetSTLCollectionFromBytes<std::vector<wchar_t> >(Text, bytes, cb, document_code_page);
+			FormatUtils::GetSTLCollectionFromBytes<std::vector<wchar_t> >(Text, bytes, cb, nDocumentCodePage);
 
 			RELEASEARRAYOBJECTS(bytes);
 		}
@@ -470,26 +555,27 @@ namespace DocFileFormat
 			delete storageOut;
 			return false;
 		}
+		DecryptStream( 0, L"/", storageIn, storageOut, Decryptor);
 
-		std::list<std::string> listStream = storageIn->entries();
+		//std::list<std::string> listStream = storageIn->entries();
 
-		for (std::list<std::string>::iterator it = listStream.begin(); it != listStream.end(); it++)
-		{
-			if (storageIn->isDirectory(*it)) 
-			{
-				std::list<std::string> list_entry = storageIn->GetAllStreams(*it);
-				
-				for (std::list<std::string>::iterator it2 = list_entry.begin(); it2 != list_entry.end(); it2++)
-				{
-					DecryptStream(Decryptor, *it2, storageIn, storageOut);
-				}
-			}
-			else 
-			{
-				DecryptStream(Decryptor, *it, storageIn, storageOut);
-			}
+		//for (std::list<std::string>::iterator it = listStream.begin(); it != listStream.end(); ++it)
+		//{
+		//	if (storageIn->isDirectory(*it)) 
+		//	{
+		//		std::list<std::string> list_entry = storageIn->GetAllStreams(*it);
+		//		
+		//		for (std::list<std::string>::iterator it2 = list_entry.begin(); it2 != list_entry.end(); it2++)
+		//		{
+		//			DecryptStream(Decryptor, *it2, storageIn, storageOut);
+		//		}
+		//	}
+		//	else 
+		//	{
+		//		DecryptStream(Decryptor, *it, storageIn, storageOut);
+		//	}
 
-		}
+		//}
 
 		storageOut->close();
 		delete storageOut;
@@ -500,52 +586,60 @@ namespace DocFileFormat
 		
 		m_pStorage->SetFile(m_sTempDecryptFileName.c_str());
 		
-		if (m_pStorage->GetStream ("WordDocument", &WordDocumentStream) == false) return false;
+		if (m_pStorage->GetStream (L"WordDocument", &WordDocumentStream) == false) return false;
 
 		if (FIB->m_FibBase.fWhichTblStm)
 		{
-			if (!m_pStorage->GetStream ("1Table", &TableStream))	m_pStorage->GetStream ("0Table", &TableStream);
+			if (!m_pStorage->GetStream (L"1Table", &TableStream))	m_pStorage->GetStream (L"0Table", &TableStream);
 		}
 		else
 		{
-			if (!m_pStorage->GetStream ("0Table", &TableStream))	m_pStorage->GetStream ("1Table", &TableStream);
+			if (!m_pStorage->GetStream (L"0Table", &TableStream))	m_pStorage->GetStream (L"1Table", &TableStream);
 		}
 		return true;
 	}
-	bool WordDocument::CopyStream (std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut)
+	void WordDocument::DecryptStream( int level, std::wstring path, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor)
 	{
-		POLE::Stream *stream = new POLE::Stream(storageIn, streamName);
-		if (!stream) return false;
-
-		stream->seek(0);
-		int sz_stream = stream->size();
+		std::list<std::wstring> entries, entries_files, entries_dir;
+		entries = storageIn->entries_with_prefix( path );
 		
-		POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, sz_stream);
-		if (!streamNew) return false;
+		for( std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); ++it )
+		{
+			std::wstring name = *it;
+			std::wstring fullname = path + name;
+	       
+			if( storageIn->isDirectory( fullname ) )
+			{
+				entries_dir.push_back(name);
+			}
+			else
+			{
+				entries_files.push_front(name);
+			}
+		}	    
+		for( std::list<std::wstring>::iterator it = entries_dir.begin(); it != entries_dir.end(); ++it )
+		{
+			std::wstring fullname = path + *it;
+	       
+			DecryptStream( level + 1, fullname + L"/", storageIn, storageOut, Decryptor );
 
-		unsigned char* data_stream = new unsigned char[sz_stream];
-		stream->read(data_stream, sz_stream);
+		}    
+	//if (bSortFiles)
+		entries_files.sort();
 
-		streamNew->write(data_stream, sz_stream);
-
-		RELEASEARRAYOBJECTS(data_stream);
-
-		streamNew->flush();
-				
-		delete streamNew;
-		delete stream;
-		
-		return true;
+		for( std::list<std::wstring>::iterator it = entries_files.begin(); it != entries_files.end(); ++it )
+		{
+			std::wstring fullname = path + *it;
+			DecryptStream(fullname, storageIn, storageOut, Decryptor );
+		}  
 	}
-
-
-	bool WordDocument::DecryptStream(CRYPT::Decryptor* Decryptor, std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut)
+	bool WordDocument::DecryptStream(std::wstring streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor)
 	{
 		POLE::Stream *stream = new POLE::Stream(storageIn, streamName);
 		if (!stream) return false;
 
 		stream->seek(0);
-		int size_stream = stream->size();
+		POLE::uint64 size_stream = stream->size();
 		
 		POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, size_stream);
 		if (!streamNew) return false;
@@ -554,9 +648,9 @@ namespace DocFileFormat
 		stream->read(data_stream, size_stream);
 
 		unsigned char* data_store = NULL;
-		int size_data_store = 0;
+		int size_data_store = 0;		
 		
-		if ("WordDocument" == streamName)
+		if ( std::wstring::npos != streamName.find(L"WordDocument") )
 		{
 			size_data_store = 68;
 			data_store = new unsigned char[size_data_store];
@@ -565,8 +659,10 @@ namespace DocFileFormat
 		if (data_store)
 			memcpy(data_store, data_stream, size_data_store);
 
-		int size_block = 0x200;
-		for (int pos = 0, block = 0 ; pos < size_stream; pos += size_block, block++)
+		size_t			size_block	= 0x200;
+		unsigned long	block		= 0;
+
+		for (POLE::uint64 pos = 0; pos < size_stream; pos += size_block, block++)
 		{
 			if (pos + size_block > size_stream)
 				size_block = size_stream - pos;
@@ -659,6 +755,8 @@ namespace DocFileFormat
 		RELEASEOBJECT(SectionPlex);
 		RELEASEOBJECT(BookmarkStartPlex);
 		RELEASEOBJECT(BookmarkEndPlex);
+		RELEASEOBJECT(AnnotStartPlex);
+		RELEASEOBJECT(AnnotEndPlex);
 		RELEASEOBJECT(AutoTextPlex);
 		RELEASEOBJECT(ListPlex);
 		RELEASEOBJECT(Styles);

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -69,7 +69,6 @@ namespace DocFileFormat
 {
 	class WordDocument: public IVisitable
 	{
-		/*Mapping classes with direct access to the Word Document.*/
 		friend class FootnotesMapping;
 		friend class EndnotesMapping;
         friend class CommentsMapping;
@@ -98,18 +97,19 @@ namespace DocFileFormat
 		long LoadDocument (const std::wstring & fileName, const std::wstring & password);
 
 		bool	bOlderVersion;
-		int		document_code_page;
-
-	private:
-		bool DecryptOfficeFile	(CRYPT::Decryptor* Decryptor);
-		bool DecryptStream		(CRYPT::Decryptor* Decryptor, std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut);
-		bool CopyStream			(std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut);
-
+		int		nDocumentCodePage;
+		bool	bDocumentCodePage;
+		
 		inline StructuredStorageReader* GetStorage() const
 		{
 			return m_pStorage;
 		}
-
+	private:
+		bool DecryptOfficeFile	(CRYPT::Decryptor* Decryptor);
+		
+		bool DecryptStream		(std::wstring streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor);
+		void DecryptStream		(int level, std::wstring streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor);
+		
 		inline OfficeArtContent* GetOfficeArt ()
 		{
 			return officeArtContent;
@@ -162,7 +162,9 @@ namespace DocFileFormat
 		std::vector<int>							* AllPapxVector;// A vector to quick find in AllPapx
 
 		std::map<int, int>						PictureBulletsCPsMap;
+
 		std::vector<std::pair<int, int>>		BookmarkStartEndCPs;
+		std::vector<std::pair<int, int>>		AnnotStartEndCPs;
 
 		FileInformationBlock				* FIB;
 		StyleSheet							* Styles;					// The style sheet of the document
@@ -204,7 +206,10 @@ namespace DocFileFormat
 		Plex<SectionDescriptor>				*SectionPlex;						// A Plex containing all section descriptors
 	
 		Plex<BookmarkFirst>					*BookmarkStartPlex;
-		Plex<EmptyStructure>				*BookmarkEndPlex;		
+		Plex<EmptyStructure>				*BookmarkEndPlex;
+
+		Plex<BookmarkFirst>					*AnnotStartPlex;
+		Plex<EmptyStructure>				*AnnotEndPlex;
 
 		Plex<ListNumCache>					*ListPlex;
 		Plex<FieldCharacter>				*FieldsPlex;

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

@@ -35,6 +35,10 @@
 #include "../../DesktopEditor/raster/BgraFrame.h"
 #include "../../DesktopEditor/common/Directory.h"
 
+#include "../../Common/DocxFormat/Source/DocxFormat/App.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Core.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/ContentTypes.h"
+
 namespace ImageHelper
 {
     struct __BITMAPINFOHEADER
@@ -71,7 +75,7 @@ namespace ImageHelper
 		__BITMAPINFOHEADER * header = (__BITMAPINFOHEADER*)data;
 		if (!header) return result;
 
-		result == Global::msoblipDIB;
+		result = Global::msoblipDIB;
 
 		if (header->biWidth > 100000 || header->biHeight > 100000 || header->biSize != 40)
 		{
@@ -180,10 +184,68 @@ namespace DocFileFormat
 	{
 	}
 
-	void WordprocessingDocument::SaveDocument()
+	void WordprocessingDocument::SaveDocument(bool &bMacros)
 	{
-        std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + L"word" ;
-         NSDirectory::CreateDirectory( pathWord );
+		std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + L"word" ;
+		NSDirectory::CreateDirectory( pathWord );
+
+		if (bMacros && docFile->GetStorage()->isDirectory(L"Macros"))
+		{
+			std::wstring sVbaProjectFile = pathWord + FILE_SEPARATOR_STR + L"vbaProject.bin";
+
+			POLE::Storage *storageVbaProject = new POLE::Storage(sVbaProjectFile.c_str());
+
+			if ((storageVbaProject) && (storageVbaProject->open(true, true)))
+			{			
+				docFile->GetStorage()->copy(0, L"Macros/", storageVbaProject, false);
+
+				storageVbaProject->close();
+				delete storageVbaProject;
+
+				RegisterDocumentMacros();
+				RegisterVbaProject();	
+				//output_document->get_xl_files().add_vba_project();
+			}
+			else bMacros = false;
+		}
+		else 
+			bMacros = false;
+
+		if (!bMacros)
+		{
+			RegisterDocument();
+		}
+		OOX::CContentTypes oContentTypes;
+		OOX::CPath pathDocProps = m_strOutputPath + FILE_SEPARATOR_STR + _T("docProps");
+		NSDirectory::CreateDirectory(pathDocProps.GetPath());
+		
+		OOX::CPath DocProps = std::wstring(_T("docProps"));
+
+		OOX::CApp* pApp = new OOX::CApp(NULL);
+		if (pApp)
+		{
+			pApp->SetApplication(L"ONLYOFFICE");
+	#if defined(INTVER)
+			pApp->SetAppVersion(VALUE2STR(INTVER));
+	#endif
+			pApp->SetDocSecurity(0);
+			pApp->SetScaleCrop(false);
+			pApp->SetLinksUpToDate(false);
+			pApp->SetSharedDoc(false);
+			pApp->SetHyperlinksChanged(false);
+			
+			pApp->write(pathDocProps + FILE_SEPARATOR_STR + _T("app.xml"), DocProps, oContentTypes);
+			delete pApp;
+		}				
+		OOX::CCore* pCore = new OOX::CCore(NULL);
+		if (pCore)
+		{
+			pCore->SetCreator(_T(""));
+			pCore->SetLastModifiedBy(_T(""));
+			pCore->write(pathDocProps + FILE_SEPARATOR_STR + _T("core.xml"), DocProps, oContentTypes);
+			delete pCore;
+		} 
+		RegisterDocPr();
 
 		WritePackage();
 

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.h

@@ -76,6 +76,7 @@ namespace DocFileFormat
 	public:
 		WordprocessingDocument(const std::wstring & _docxDirectory, const WordDocument* _docFile);
 		virtual ~WordprocessingDocument();
-		void SaveDocument();
+		
+		void SaveDocument(bool &bMacros);
 	};
 }

ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp

@@ -34,14 +34,14 @@
 #include "../DocDocxConverter/Converter.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
-HRESULT COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, ProgressCallback *ffCallBack )
+HRESULT COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack)
 {
 	HRESULT hr = S_FALSE;
 
 	DocFileFormat::Converter docToDocx;
 	docToDocx.m_sTempFolder = m_sTempFolder;
 
-    hr= docToDocx.LoadAndConvert(docFile, docxDirectory, password, ffCallBack);
+    hr= docToDocx.LoadAndConvert(docFile, docxDirectory, password, ffCallBack, bMacros);
 
 	return hr;
 }

ASCOfficeDocFile/DocFormatLib/DocFormatLib.h

@@ -53,7 +53,7 @@ public:
 
 	std::wstring m_sTempFolder;
 
-    HRESULT LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstFileName, const std::wstring & password, ProgressCallback *ffCallBack = NULL);
+    HRESULT LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstFileName, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack = NULL);
     HRESULT SaveToFile(const std::wstring &  sDstFileName, const std::wstring &  sSrcFileName, ProgressCallback *ffCallBack = NULL);
 
 };

ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro

@@ -94,6 +94,7 @@ SOURCES += \
     ../../DocDocxConverter/VMLShapeTypeMapping.cpp \
     ../../DocDocxConverter/WordDocument.cpp \
     ../../DocDocxConverter/WordprocessingDocument.cpp \
+    ../../DocDocxConverter/FormFieldData.cpp \
     ../../DocDocxConverter/OfficeDrawing/Record.cpp \
     ../../DocDocxConverter/OfficeDrawing/RecordFactory.cpp \
     ../../DocDocxConverter/OfficeDrawing/ShapeTypeFactory.cpp

ASCOfficeDocFile/DocFormatLib/Linux/docformatlib_converter.cpp

@@ -74,6 +74,7 @@
 #include "../../DocDocxConverter/VMLShapeTypeMapping.cpp"
 #include "../../DocDocxConverter/WordDocument.cpp"
 #include "../../DocDocxConverter/WordprocessingDocument.cpp"
+#include "../../DocDocxConverter/FormFieldData.cpp"
 #include "../../DocDocxConverter/OfficeDrawing/Record.cpp"
 #include "../../DocDocxConverter/OfficeDrawing/RecordFactory.cpp"
 #include "../../DocDocxConverter/OfficeDrawing/ShapeTypeFactory.cpp"

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj

@@ -47,7 +47,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -107,7 +107,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="C:\_WORK\trunk\ServerComponents\Common\DocxFormat\Source\XML\libxml2\XML\include"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="_DEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -479,6 +479,14 @@
 				RelativePath="..\..\DocDocxConverter\FormattedDiskPagePAPX.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\DocDocxConverter\FormFieldData.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\DocDocxConverter\FormFieldData.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\Global.h"
 				>
@@ -1090,6 +1098,10 @@
 					RelativePath="..\..\DocDocxConverter\FootnotesMapping.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\FormFieldDataMapping.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\DocDocxConverter\HeaderMapping.cpp"
 					>

ASCOfficeDocFile/DocFormatTest/DocFile_VS2005.sln

@@ -2,34 +2,38 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatLib", "..\DocFormatLib\Win32\DocFormatLib.vcproj", "{C5371405-338F-4B70-83BD-2A5CDF64F383}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
+		{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
-		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
+		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeUtilsLib", "..\..\OfficeUtils\win32\OfficeUtilsLib.vcproj", "{F8274B05-168E-4D6E-B843-AA7510725363}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
 	ProjectSection(ProjectDependencies) = postProject
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
 		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
 	ProjectSection(ProjectDependencies) = postProject
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
-		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
-		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
-		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
 		{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
+		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
+		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
+		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
@@ -54,17 +58,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsFormat", "..\..\ASCOffic
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatTest", "DocFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
 	ProjectSection(ProjectDependencies) = postProject
-		{C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
-		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
-		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
-		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
-		{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
-		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
 		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
+		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
+		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
+		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
+		{C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"

ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp

@@ -29,19 +29,17 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-// DocFormatTest.cpp : Defines the entry point for the console application.
-//
-#include "../DocFormatLib/DocFormatLib.h"
-
-#include "../../OfficeUtils/src/ASCOfficeCriticalSection.h"
+#include <iostream>
 
+#include "../../Common/DocxFormat/Source/Base/Base.h"
+#include "../../DesktopEditor/common/Directory.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
-#include "../../DesktopEditor/common/Directory.h"
+#include "../DocFormatLib/DocFormatLib.h"
 
-#include <string>
-#include <windows.h>
-#include <tchar.h>
+#pragma comment(lib,"Shell32.lib")	
+#pragma comment(lib,"Advapi32.lib")
+#pragma comment(lib,"Rpcrt4.lib")
 
 #if defined(_WIN64)
 	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
@@ -49,26 +47,34 @@
 	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
 #endif
 
-int _tmain(int argc, _TCHAR* argv[])
+HRESULT convert_single(std::wstring srcFileName)
 {
-	if (argc < 2) return 1;
+	HRESULT hr = S_OK;
 
-	std::wstring sSrcDoc	= argv[1];
-	std::wstring sDstDocx	= argc > 2 ? argv[2] : sSrcDoc + L"-my.docx";
-
-	std::wstring outputDir		= NSDirectory::GetFolderPath(sDstDocx);
+	std::wstring outputDir		= NSDirectory::GetFolderPath(srcFileName);	
 	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
+	std::wstring dstPath;
 
 	COfficeDocFile docFile;
 
 	docFile.m_sTempFolder = outputDir;
 	
-	HRESULT hRes = docFile.LoadFromFile( sSrcDoc, dstTempPath, L"password", NULL);
+	bool bMacros = true;
+	HRESULT hRes = docFile.LoadFromFile( srcFileName, dstTempPath, L"password", bMacros, NULL);
 	
+	if (bMacros)
+	{
+		dstPath = srcFileName + L"-my.docm";
+	}
+	else
+	{
+		dstPath = srcFileName + L"-my.docx";
+
+	}
 	if (hRes == S_OK)
 	{
 		COfficeUtils oCOfficeUtils(NULL);
-		hRes = oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), sDstDocx, -1);
+		hRes = oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), dstPath, -1);
 	}
 	
 	NSDirectory::DeleteDirectory(dstTempPath);
@@ -76,3 +82,33 @@ int _tmain(int argc, _TCHAR* argv[])
 	return hRes;
 }
 
+
+HRESULT convert_directory(std::wstring pathName)
+{
+	HRESULT hr = S_OK;
+
+	std::vector<std::wstring> arFiles = NSDirectory::GetFiles(pathName, false);
+
+	for (size_t i = 0; i < arFiles.size(); i++)
+	{
+		convert_single(arFiles[i]);
+	}
+	return S_OK;
+}
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+	if (argc < 2) return 1;
+
+	HRESULT hr = -1;
+	if (NSFile::CFileBinary::Exists(argv[1]))
+	{	
+		hr = convert_single(argv[1]);
+	}
+	else if (NSDirectory::Exists(argv[1]))
+	{
+		hr = convert_directory(argv[1]);
+	}
+
+	return hr;
+}

ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj

@@ -44,11 +44,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\Common\OfficeDrawing;&quot;..\..\..\..\..\DesktopEditor\freetype-2.5.2\include&quot;;..\..\..\..\..\Common\OfficeDrawing\Shapes"
+				AdditionalIncludeDirectories="../../DesktopEditor/xml/build/vs2005;../../DesktopEditor/xml/libxml2/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -67,7 +67,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="Urlmon.lib"
 				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBCMT.lib"
+				IgnoreDefaultLibraryNames=""
 				IgnoreEmbeddedIDL="true"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -392,6 +392,14 @@
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions="/bigobj"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<File
@@ -442,6 +450,10 @@
 			RelativePath="..\..\Common\OfficeFileFormatChecker2.cpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\Common\3dParty\pole\pole.cpp"
+			>
+		</File>
 		<File
 			RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
 			>

ASCOfficeDocxFile2/BinReader/DocumentWriter.h

@@ -40,11 +40,11 @@ namespace Writers
 	class DocumentWriter : public ContentWriter
 	{
 		XmlUtils::CStringWriter	m_oWriter;
-		HeaderFooterWriter& m_oHeaderFooterWriter;
+		HeaderFooterWriter&		m_oHeaderFooterWriter;
 	public:
-         std::wstring	m_sDir;
-	public:
-        DocumentWriter( std::wstring sDir, HeaderFooterWriter& oHeaderFooterWriter):m_sDir(sDir), m_oHeaderFooterWriter(oHeaderFooterWriter)
+         std::wstring			m_sDir;
+
+		DocumentWriter( std::wstring sDir, HeaderFooterWriter& oHeaderFooterWriter):m_sDir(sDir), m_oHeaderFooterWriter(oHeaderFooterWriter)
 		{
 		}
 		void Write()
@@ -54,7 +54,24 @@ namespace Writers
 			NSFile::CFileBinary oFile;
 			oFile.CreateFileW(filePath.GetPath());			
                 oFile.WriteStringUTF8( std::wstring(_T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>")));
-                oFile.WriteStringUTF8( std::wstring(_T("<w:document xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\">")));
+                oFile.WriteStringUTF8( std::wstring(_T("<w:document \
+xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
+xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
+xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
+xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
+xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
+xmlns:v=\"urn:schemas-microsoft-com:vml\" \
+xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" \
+xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
+xmlns:w10=\"urn:schemas-microsoft-com:office:word\" \
+xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
+xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
+xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" \
+xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" \
+xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
+xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
+xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" \
+mc:Ignorable=\"w14 wp14\">")));
 
                 oFile.WriteStringUTF8(m_oBackground.GetData());
 

ASCOfficeDocxFile2/BinReader/FileWriter.h

@@ -31,7 +31,9 @@
  */
 #ifndef FILE_WRITER
 #define FILE_WRITER
+
 #include "../../DesktopEditor/common/Path.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Media/VbaProject.h"
 
 #include "NumberingWriter.h"
 #include "fontTableWriter.h"
@@ -75,6 +77,8 @@ namespace Writers
 		DocumentRelsWriter		m_oDocumentRelsWriter;
 		WebSettingsWriter		m_oWebSettingsWriter;
 		DefaultThemeWriter		m_oTheme;
+		
+		smart_ptr<OOX::VbaProject>		m_pVbaProject;
 	
  		NSBinPptxRW::CDrawingConverter* m_pDrawingConverter;
 		bool							m_bSaveChartAsImg;

ASCOfficeDocxFile2/BinReader/HeaderFooterWriter.h

@@ -60,16 +60,50 @@ namespace Writers
         std::wstring			rId;
 		SimpleTypes::EHdrFtr	eType;
 	};
-    static  std::wstring g_string_hdr_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:hdr xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\">");
+    static  std::wstring g_string_hdr_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
+<w:hdr xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
+xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
+xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
+xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
+xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
+xmlns:v=\"urn:schemas-microsoft-com:vml\" \
+xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" \
+xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
+xmlns:w10=\"urn:schemas-microsoft-com:office:word\" \
+xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
+xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
+xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" \
+xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" \
+xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
+xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
+xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" \
+mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_hdr_End = _T("</w:hdr>");
 
-    static  std::wstring g_string_ftr_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:ftr xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\">");
+    static  std::wstring g_string_ftr_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
+<w:ftr xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
+xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
+xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
+xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
+xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
+xmlns:v=\"urn:schemas-microsoft-com:vml\" \
+xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" \
+xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
+xmlns:w10=\"urn:schemas-microsoft-com:office:word\" \
+xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
+xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
+xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" \
+xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" \
+xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
+xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
+xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" \
+mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_ftr_End = _T("</w:ftr>");
 
-    static  std::wstring g_string_footnotes_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:footnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\">");
+    static  std::wstring g_string_footnotes_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:footnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_footnotes_End = _T("</w:footnotes>");
 
-    static  std::wstring g_string_endnotes_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:endnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\">");
+    static  std::wstring g_string_endnotes_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:endnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_endnotes_End = _T("</w:endnotes>");
 
 	class HeaderFooterWriter 

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -355,10 +355,13 @@ class Tab
 public:
 	BYTE Val;
 	double Pos;
+	BYTE Leader;
+	bool bLeader;
 	Tab()
 	{
 		Val = shd_Nil;
 		Pos = 0;
+		bLeader = false;
 	}
 };
 class Tabs
@@ -369,7 +372,7 @@ public:
 class rPr
 {
 private:
-    std::map<std::wstring, int>& m_mapFonts;
+    boost::unordered_map<std::wstring, int>& m_mapFonts;
 public:
 	bool Bold;
 	bool Italic;
@@ -442,7 +445,7 @@ public:
 
 	bool bDoNotWriteNullProp;
 public:
-    rPr(std::map<std::wstring, int>& mapFonts) : m_mapFonts(mapFonts)
+    rPr(boost::unordered_map<std::wstring, int>& mapFonts) : m_mapFonts(mapFonts)
 	{
 		Reset();
 
@@ -1583,6 +1586,7 @@ public:
     std::wstring UserName;
     std::wstring UserId;
     std::wstring Date;
+	std::wstring OOData;
 	bool Solved;
     std::wstring Text;
     std::wstring m_sParaId;
@@ -1696,7 +1700,7 @@ public:
             std::vector<std::wstring> arSplit;
             boost::algorithm::split(arSplit, pComment->UserName, boost::algorithm::is_any_of(L" "), boost::algorithm::token_compress_on);
 
-            for (int i = 0; i < arSplit.size(); i++)
+            for (size_t i = 0; i < arSplit.size(); i++)
             {
                 sInitials += arSplit[i][0];
             }
@@ -1706,9 +1710,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);
@@ -1725,7 +1736,7 @@ public:
 
             bool bFirst = true;
 			int nPrevIndex = 0;
-            for(size_t i = 0; i < sText.length(); i++)
+            for (int i = 0; i < (int)sText.length(); i++)
 			{
                 wchar_t cToken = sText[i];
 				if('\n' == cToken)
@@ -1776,8 +1787,8 @@ w15:paraIdParent=\"" + pComment->m_sParaIdParent + L"\" w15:done=\"" + sDone + L
 };
 class CComments
 {
-	std::map<int, CComment*> m_mapComments;
-    std::map<std::wstring, CComment*> m_mapAuthors;
+    boost::unordered_map<int, CComment*>          m_mapComments;
+    boost::unordered_map<std::wstring, CComment*> m_mapAuthors;
 public:
 	IdCounter m_oFormatIdCounter;
 	IdCounter m_oParaIdCounter;
@@ -1787,7 +1798,7 @@ public:
 	}
 	~CComments()
 	{
-		for (std::map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
+        for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
 			delete it->second;
 		}
@@ -1811,7 +1822,7 @@ public:
 	CComment* get(int nInd)
 	{
 		CComment* pRes = NULL;
-		std::map<int, CComment*>::const_iterator pair = m_mapComments.find(nInd);
+        boost::unordered_map<int, CComment*>::const_iterator pair = m_mapComments.find(nInd);
 		if(m_mapComments.end() != pair)
 			pRes = pair->second;
 		return pRes;
@@ -1823,7 +1834,7 @@ public:
     std::wstring writeContent()
 	{
         std::wstring sRes;
-		for (std::map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
+        for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
             sRes += (it->second->writeTemplates(CComment::writeContent));
 		}
@@ -1832,7 +1843,7 @@ public:
     std::wstring writeContentExt()
 	{
         std::wstring sRes;
-		for (std::map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
+        for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
             sRes += (it->second->writeTemplates(CComment::writeContentExt));
 		}
@@ -1841,7 +1852,7 @@ public:
     std::wstring writePeople()
 	{
         std::wstring sRes;
-        for (std::map<std::wstring, CComment*>::const_iterator it = m_mapAuthors.begin(); it != m_mapAuthors.end(); ++it)
+        for (boost::unordered_map<std::wstring, CComment*>::const_iterator it = m_mapAuthors.begin(); it != m_mapAuthors.end(); ++it)
 		{
             sRes += (it->second->writePeople(it->second));
 		}
@@ -2329,7 +2340,7 @@ public:
 	{
         return Jc.empty() && TableInd.empty() && TableW.empty() && TableCellMar.empty() && TableBorders.empty() && Shd.empty() && tblpPr.empty()&& Style.empty() && Look.empty() && tblPrChange.empty() && TableCellSpacing.empty() && RowBandSize.empty() && ColBandSize.empty();
 	}
-    std::wstring Write(bool bBandSize, bool bLayout)
+	std::wstring Write()
 	{
         std::wstring sRes;
         sRes += L"<w:tblPr>";
@@ -2353,13 +2364,8 @@ public:
             sRes += (TableBorders);
         if(false == Shd.empty())
             sRes += (Shd);
-		if(bLayout)
-		{
-            if(false == Layout.empty())
-                sRes += (Layout);
-			else if(g_nCurFormatVersion < 4)
-                sRes += L"<w:tblLayout w:type=\"fixed\"/>";
-		}
+		if(false == Layout.empty())
+			sRes += (Layout);
         if(false == TableCellMar.empty())
             sRes += (TableCellMar);
         if(false == Look.empty())
@@ -2747,7 +2753,7 @@ public:
 				}
 				if(NULL != tblPr)
 				{
-					pCStringWriter->WriteString(tblPr->Write(false, true));
+					pCStringWriter->WriteString(tblPr->Write());
 				}
                 if(NULL != tblGridChange)
                 {

ASCOfficeDocxFile2/BinReader/Readers.cpp

@@ -34,6 +34,14 @@
 
 namespace BinDocxRW {
 
+int Binary_VbaProjectTableReader::Read()
+{
+	m_oFileWriter.m_pVbaProject = new OOX::VbaProject(NULL);
+    m_oFileWriter.m_pVbaProject->fromPPTY(&m_oBufferedStream);
+
+    return c_oSerConstants::ReadOk;
+}
+//-------------------------------------------------------------------------------------	
 Binary_HdrFtrTableReader::Binary_HdrFtrTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, CComments* pComments):Binary_CommonReader(poBufferedStream),m_oFileWriter(oFileWriter),m_oHeaderFooterWriter(oFileWriter.m_oHeaderFooterWriter),m_pComments(pComments)
 {
 }
@@ -93,9 +101,9 @@ int Binary_HdrFtrTableReader::ReadHdrFtrItem(BYTE type, long length, void* poRes
 			Binary_DocumentTableReader oBinary_DocumentTableReader(m_oBufferedStream, m_oFileWriter, poHdrFtrItem->Header, m_pComments);
 			res = Read1(length, &Binary_HdrFtrTableReader::ReadHdrFtrItemContent, this, &oBinary_DocumentTableReader);
 
-            OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir +	FILE_SEPARATOR_STR + _T("word") + 
-																				FILE_SEPARATOR_STR + _T("_rels")+ 
-																				FILE_SEPARATOR_STR + poHdrFtrItem->m_sFilename + _T(".rels");
+            OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir +	FILE_SEPARATOR_STR + L"word" + 
+																				FILE_SEPARATOR_STR + L"_rels"+ 
+																				FILE_SEPARATOR_STR + poHdrFtrItem->m_sFilename + L".rels";
 
             m_oFileWriter.m_pDrawingConverter->SaveDstContentRels(fileRelsPath.GetPath());
 		}

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -37,7 +37,17 @@
 
 #include "../BinWriter/BinReaderWriterDefines.h"
 #include "../../XlsxSerializerCom/Writer/BinaryReader.h"
+
 #include "../../Common/DocxFormat/Source/DocxFormat/Docx.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Document.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/FontTable.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Numbering.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Comments.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Styles.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Footnote.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Endnote.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Settings/Settings.h"
+
 #include "../DocWrapper/XlsxSerializer.h"
 
 #include "../../DesktopEditor/common/ASCVariant.h"
@@ -61,6 +71,13 @@ enum ETblStyleOverrideType
 	tblstyleoverridetypeSwCell     = 11,
 	tblstyleoverridetypeWholeTable = 12
 };
+
+struct RowHeight
+{
+	unsigned char	HRule	= 0;
+	long			nHeight	= 0;
+};
+
 class SdtWraper
 {
 public:
@@ -273,6 +290,20 @@ private:
 		return res;
 	}
 };
+class Binary_VbaProjectTableReader : public Binary_CommonReader<Binary_VbaProjectTableReader>
+{
+	Writers::FileWriter&	m_oFileWriter;
+
+public:
+
+	Binary_VbaProjectTableReader (NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter)
+			: Binary_CommonReader(poBufferedStream), m_oFileWriter(oFileWriter)
+	{
+	}
+
+    int Read ();
+};
+
 class Binary_HdrFtrTableReader : public Binary_CommonReader<Binary_HdrFtrTableReader>
 {
 	Writers::FileWriter&	m_oFileWriter;
@@ -282,12 +313,12 @@ class Binary_HdrFtrTableReader : public Binary_CommonReader<Binary_HdrFtrTableRe
 	int						nCurHeaderType;
 public:
 	Writers::HeaderFooterWriter& m_oHeaderFooterWriter;
-public:
+	
 	Binary_HdrFtrTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, CComments* pComments);
     int Read();
-    int ReadHdrFtrContent(BYTE type, long length, void* poResult);
-    int ReadHdrFtrFEO(BYTE type, long length, void* poResult);
-    int ReadHdrFtrItem(BYTE type, long length, void* poResult);
+    int ReadHdrFtrContent	(BYTE type, long length, void* poResult);
+    int ReadHdrFtrFEO		(BYTE type, long length, void* poResult);
+    int ReadHdrFtrItem		(BYTE type, long length, void* poResult);
 	int ReadHdrFtrItemContent(BYTE type, long length, void* poResult);
 };
 class Binary_rPrReader : public Binary_CommonReader<Binary_rPrReader>
@@ -551,7 +582,7 @@ public:
                     std::wstring strXml;
                     HRESULT hRes = m_oFileWriter.m_pDrawingConverter->GetRecordXml(nCurPos, length, XMLWRITER_RECORD_TYPE_TEXT_FILL, XMLWRITER_DOC_TYPE_WORDART, strXml);
                     if (S_OK == hRes)
-                        orPr->Fill = _T("<w14:textFill>") + strXml + _T("</w14:textFill>");
+                        orPr->Fill = L"<w14:textFill>" + strXml + L"</w14:textFill>";
 					m_oBufferedStream.Seek(nCurPos + length);
 				}
 			}
@@ -560,35 +591,35 @@ public:
 			{
 				TrackRevision oDel;
 				oBinary_CommonReader2.ReadTrackRevision(length, &oDel);
-				orPr->Del = oDel.ToString(_T("w:del"));
+				orPr->Del = oDel.ToString(L"w:del");
 			}
 			break;
 		case c_oSerProp_rPrType::Ins:
 			{
 				TrackRevision oIns;
 				oBinary_CommonReader2.ReadTrackRevision(length, &oIns);
-				orPr->Ins = oIns.ToString(_T("w:ins"));
+				orPr->Ins = oIns.ToString(L"w:ins");
 			}
 			break;
 		case c_oSerProp_rPrType::MoveFrom:
 			{
 				TrackRevision oMoveFrom;
 				oBinary_CommonReader2.ReadTrackRevision(length, &oMoveFrom);
-				orPr->MoveFrom = oMoveFrom.ToString(_T("w:moveFrom"));
+				orPr->MoveFrom = oMoveFrom.ToString(L"w:moveFrom");
 			}
 			break;
 		case c_oSerProp_rPrType::MoveTo:
 			{
 				TrackRevision oMoveTo;
 				oBinary_CommonReader2.ReadTrackRevision(length, &oMoveTo);
-				orPr->MoveTo = oMoveTo.ToString(_T("w:moveTo"));
+				orPr->MoveTo = oMoveTo.ToString(L"w:moveTo");
 			}
 			break;
 		case c_oSerProp_rPrType::rPrChange:
 			{
 				TrackRevision oRPrChange;
 				res = Read1(length, &Binary_rPrReader::ReadrPrChange, this, &oRPrChange);
-				orPr->rPrChange = oRPrChange.ToString(_T("w:rPrChange"));
+				orPr->rPrChange = oRPrChange.ToString(L"w:rPrChange");
 			}
 			break;
 		default:
@@ -647,9 +678,9 @@ public:
 			{
 				BYTE contextualSpacing = m_oBufferedStream.GetUChar();
 				if(0 != contextualSpacing)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:contextualSpacing w:val=\"true\"/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:contextualSpacing w:val=\"true\"/>"));
 				else if(false == bDoNotWriteNullProp)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:contextualSpacing w:val=\"false\"/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:contextualSpacing w:val=\"false\"/>"));
             }break;
 		case c_oSerProp_pPrType::Ind:
 			{
@@ -657,9 +688,9 @@ public:
 				res = Read2(length, &Binary_pPrReader::ReadInd, this, &oTempWriter);
 				if(oTempWriter.GetCurSize() > 0)
 				{
-                    pCStringWriter->WriteString(std::wstring(_T("<w:ind")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:ind"));
 					pCStringWriter->Write(oTempWriter);
-                    pCStringWriter->WriteString(std::wstring(_T("/>")));
+                    pCStringWriter->WriteString(std::wstring(L"/>"));
 				}
 				break;
 			}
@@ -668,35 +699,35 @@ public:
 				BYTE jc = m_oBufferedStream.GetUChar();
 				switch(jc)
 				{
-                case align_Right: pCStringWriter->WriteString(std::wstring(_T("<w:jc w:val=\"right\" />")));break;
-                case align_Left: pCStringWriter->WriteString(std::wstring(_T("<w:jc w:val=\"left\" />")));break;
-                case align_Center: pCStringWriter->WriteString(std::wstring(_T("<w:jc w:val=\"center\" />")));break;
-                case align_Justify: pCStringWriter->WriteString(std::wstring(_T("<w:jc w:val=\"both\" />")));break;
+                case align_Right: pCStringWriter->WriteString(std::wstring(L"<w:jc w:val=\"right\" />"));break;
+                case align_Left: pCStringWriter->WriteString(std::wstring(L"<w:jc w:val=\"left\" />"));break;
+                case align_Center: pCStringWriter->WriteString(std::wstring(L"<w:jc w:val=\"center\" />"));break;
+                case align_Justify: pCStringWriter->WriteString(std::wstring(L"<w:jc w:val=\"both\" />"));break;
 				}				
             }break;
 		case c_oSerProp_pPrType::KeepLines:
 			{
 				BYTE KeepLines = m_oBufferedStream.GetUChar();
 				if(0 != KeepLines)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:keepLines/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:keepLines/>"));
 				else if(false == bDoNotWriteNullProp)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:keepLines w:val=\"false\"/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:keepLines w:val=\"false\"/>"));
             }break;
 		case c_oSerProp_pPrType::KeepNext:
 			{
 				BYTE KeepNext = m_oBufferedStream.GetUChar();
 				if(0 != KeepNext)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:keepNext/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:keepNext/>"));
 				else if(false == bDoNotWriteNullProp)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:keepNext w:val=\"false\"/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:keepNext w:val=\"false\"/>"));
             }break;
 		case c_oSerProp_pPrType::PageBreakBefore:
 			{
 				BYTE pageBreakBefore = m_oBufferedStream.GetUChar();
 				if(0 != pageBreakBefore)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:pageBreakBefore/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:pageBreakBefore/>"));
 				else if(false == bDoNotWriteNullProp)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:pageBreakBefore w:val=\"false\"/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:pageBreakBefore w:val=\"false\"/>"));
 				break;
 			}
 		case c_oSerProp_pPrType::Spacing:
@@ -705,7 +736,7 @@ public:
 				res = Read2(length, &Binary_pPrReader::ReadSpacing, this, &oSpacing);
 				if(oSpacing.bLine || oSpacing.bAfter || oSpacing.bAfterAuto || oSpacing.bBefore || oSpacing.bBeforeAuto)
 				{
-                    pCStringWriter->WriteString(std::wstring(_T("<w:spacing")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:spacing"));
 					BYTE bLineRule = linerule_Auto;
 					//проверяется bLine, а не bLineRule чтобы всегда писать LineRule, если есть w:line
 					if(oSpacing.bLine)
@@ -745,9 +776,9 @@ public:
 					if(oSpacing.bAfterAuto)
 					{
 						if(true == oSpacing.AfterAuto)
-                            pCStringWriter->WriteString(std::wstring(_T(" w:afterAutospacing=\"1\"")));
+                            pCStringWriter->WriteString(std::wstring(L" w:afterAutospacing=\"1\""));
 						else
-                            pCStringWriter->WriteString(std::wstring(_T(" w:afterAutospacing=\"0\"")));
+                            pCStringWriter->WriteString(std::wstring(L" w:afterAutospacing=\"0\""));
 					}
 					if(oSpacing.bBefore)
 					{
@@ -758,11 +789,11 @@ public:
 					if(oSpacing.bBeforeAuto)
 					{
 						if(true == oSpacing.BeforeAuto)
-                            pCStringWriter->WriteString(std::wstring(_T(" w:beforeAutospacing=\"1\"")));
+                            pCStringWriter->WriteString(std::wstring(L" w:beforeAutospacing=\"1\""));
 						else
-                            pCStringWriter->WriteString(std::wstring(_T(" w:beforeAutospacing=\"0\"")));
+                            pCStringWriter->WriteString(std::wstring(L" w:beforeAutospacing=\"0\""));
 					}
-                    pCStringWriter->WriteString(std::wstring(_T("/>")));
+                    pCStringWriter->WriteString(std::wstring(L"/>"));
 				}
 				break;
 			}
@@ -776,7 +807,7 @@ public:
 				}
 				else
 				{
-                    std::wstring sShd(_T("<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"auto\"/>"));
+                    std::wstring sShd(L"<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"auto\"/>");
 					pCStringWriter->WriteString(sShd);
 				}
 				break;
@@ -787,10 +818,10 @@ public:
 				if(0 != WidowControl)
 				{
 					if(false == bDoNotWriteNullProp)
-                        pCStringWriter->WriteString(std::wstring(_T("<w:widowControl/>")));
+                        pCStringWriter->WriteString(std::wstring(L"<w:widowControl/>"));
 				}
 				else
-                    pCStringWriter->WriteString(std::wstring(_T("<w:widowControl w:val=\"off\" />")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:widowControl w:val=\"off\" />"));
 				break;
 			}
 		case c_oSerProp_pPrType::Tab:
@@ -800,7 +831,7 @@ public:
 				size_t nLen = oTabs.m_aTabs.size();
 				if(nLen > 0)
 				{
-                    pCStringWriter->WriteString(std::wstring(_T("<w:tabs>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:tabs>"));
 					for(size_t i = 0; i < nLen; ++i)
 					{
 						Tab& oTab = oTabs.m_aTabs[i];
@@ -808,14 +839,30 @@ public:
                         std::wstring sVal;
 						switch(oTab.Val)
 						{
-                            case g_tabtype_right:   sVal=_T("right");   break;
-                            case g_tabtype_center:  sVal=_T("center");  break;
-                            case g_tabtype_clear:   sVal=_T("clear");   break;
-                            default:                sVal=_T("left");    break;
+                            case g_tabtype_right:   sVal = L"right";   break;
+                            case g_tabtype_center:  sVal = L"center";  break;
+                            case g_tabtype_clear:   sVal = L"clear";   break;
+                            default:                sVal = L"left";    break;
 						}
-                        pCStringWriter->WriteString(L"<w:tab w:val=\"" + sVal + L"\" w:pos=\"" + std::to_wstring(nTab) + L"\"/>");
+						pCStringWriter->WriteString(L"<w:tab w:val=\"" + sVal + L"\" w:pos=\"" + std::to_wstring(nTab) + L"\"");
+						if (oTab.bLeader)
+						{
+							std::wstring sLeader;
+							switch(oTab.Leader)
+							{
+							case SimpleTypes::tabtlcDot        : sLeader = (L"dot");break;
+							case SimpleTypes::tabtlcHeavy      : sLeader = (L"heavy");break;
+							case SimpleTypes::tabtlcHyphen     : sLeader = (L"hyphen");break;
+							case SimpleTypes::tabtlcMiddleDot  : sLeader = (L"middleDot");break;
+							case SimpleTypes::tabtlcNone       : sLeader = (L"none");break;
+							case SimpleTypes::tabtlcUnderscore : sLeader = (L"underscore");break;
+							default                : sLeader = (L"none");break;
+							}
+							pCStringWriter->WriteString(L" w:leader=\"" + sLeader + L"\"");
+						}
+						pCStringWriter->WriteString(L"/>");
 					}
-                    pCStringWriter->WriteString(std::wstring(_T("</w:tabs>")));
+                    pCStringWriter->WriteString(std::wstring(L"</w:tabs>"));
 				}				
             }break;
 		case c_oSerProp_pPrType::ParaStyle:
@@ -826,9 +873,9 @@ public:
             }break;
 		case c_oSerProp_pPrType::numPr:
             {
-                pCStringWriter->WriteString(std::wstring(_T("<w:numPr>")));
+                pCStringWriter->WriteString(std::wstring(L"<w:numPr>"));
                 res = Read2(length, &Binary_pPrReader::ReadNumPr, this, poResult);
-                pCStringWriter->WriteString(std::wstring(_T("</w:numPr>")));
+                pCStringWriter->WriteString(std::wstring(L"</w:numPr>"));
             }break;
 		case c_oSerProp_pPrType::pPr_rPr:
 			{
@@ -871,6 +918,11 @@ public:
 				pCStringWriter->WriteString(oSectPr.Write());
                 pCStringWriter->WriteString(std::wstring(_T("</w:sectPr>")));
             }break;
+		case c_oSerProp_pPrType::outlineLvl:
+			{
+				long outlineLvl = m_oBufferedStream.GetLong();
+				pCStringWriter->WriteString(L"<w:outlineLvl w:val=\"" + std::to_wstring(outlineLvl) + L"\"/>");
+			}break;
 		default:
 			res = c_oSerConstants::ReadUnknown;
 			break;
@@ -989,6 +1041,11 @@ public:
 			poTabItem->Val = m_oBufferedStream.GetUChar();
 		else if(c_oSerProp_pPrType::Tab_Item_Pos == type)
 			poTabItem->Pos = m_oBufferedStream.GetDouble();
+		else if(c_oSerProp_pPrType::Tab_Item_Leader == type)
+		{
+			poTabItem->bLeader = true;
+			poTabItem->Leader = m_oBufferedStream.GetUChar();
+		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -2071,7 +2128,17 @@ public:
 		}
 		else if( c_oSerProp_rowPrType::Height == type )
 		{
-			res = Read2(length, &Binary_tblPrReader::ReadHeight, this, poResult);
+			RowHeight val;
+			res = Read2(length, &Binary_tblPrReader::ReadHeight, this, &val);
+           
+			pCStringWriter->WriteString(L"<w:trHeight w:val=\"" + std::to_wstring(val.nHeight) + L"\"");
+			
+			switch (val.HRule)
+			{
+				case 1: pCStringWriter->WriteString(L" w:hRule=\"auto\"");	break;
+				case 2: pCStringWriter->WriteString(L" w:hRule=\"exact\"");	break;
+			}
+			pCStringWriter->WriteString(L"/>");
 		}
 		else if( c_oSerProp_rowPrType::TableHeader == type )
 		{
@@ -2140,17 +2207,17 @@ public:
 	int ReadHeight(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
-		XmlUtils::CStringWriter* pCStringWriter = static_cast<XmlUtils::CStringWriter*>(poResult);
-		/*if( c_oSerProp_rowPrType::Height_Rule == type )
+
+		RowHeight* pHeight = static_cast<RowHeight*>(poResult);
+		
+		if( c_oSerProp_rowPrType::Height_Rule == type )
 		{
-		Height.HRule = this.stream.GetUChar();
+			pHeight->HRule = m_oBufferedStream.GetUChar();
 		}
-		else */if( c_oSerProp_rowPrType::Height_Value == type )
+		else if( c_oSerProp_rowPrType::Height_Value == type )
 		{
 			double dHeight = m_oBufferedStream.GetDouble();
-			long nHeight = SerializeCommon::Round( g_dKoef_mm_to_twips * dHeight);
-
-            pCStringWriter->WriteString(L"<w:trHeight w:val=\"" + std::to_wstring(nHeight) + L"\"/>");
+			pHeight->nHeight = SerializeCommon::Round( g_dKoef_mm_to_twips * dHeight);
 		}
 		else
 			res = c_oSerConstants::ReadUnknown;
@@ -2786,7 +2853,7 @@ public:
 		{
 			CWiterTblPr oWiterTblPr;
 			oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr);
-			odocStyle->TablePr = oWiterTblPr.Write(true, false);
+			odocStyle->TablePr = oWiterTblPr.Write();
 		}
 		else if(c_oSer_sts::Style_RowPr == type)
 		{
@@ -2882,7 +2949,7 @@ public:
 			oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr);
 
             if(false == oWiterTblPr.IsEmpty())
-				ptblStylePr->Writer.WriteString(oWiterTblPr.Write(false, false));
+				ptblStylePr->Writer.WriteString(oWiterTblPr.Write());
 		}
 		else if(c_oSerProp_tblStylePrType::TrPr == type)
 		{
@@ -2917,13 +2984,14 @@ class Binary_OtherTableReader : public Binary_CommonReader<Binary_OtherTableRead
 	Writers::FileWriter& m_oFileWriter;
     std::wstring m_sFileInDir;
 public:
-    Binary_OtherTableReader(std::wstring sFileInDir, NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter):m_sFileInDir(sFileInDir),Binary_CommonReader(poBufferedStream),m_oFileWriter(oFileWriter)
+    Binary_OtherTableReader(std::wstring sFileInDir, NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter) 
+		: m_sFileInDir(sFileInDir), Binary_CommonReader(poBufferedStream), m_oFileWriter(oFileWriter)
 	{
 	}
 	int Read()
 	{
 		return ReadTable(&Binary_OtherTableReader::ReadOtherContent, this);
-	};
+	}
 	int ReadOtherContent(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
@@ -2933,7 +3001,7 @@ public:
 		}
 		else if(c_oSerOtherTableTypes::DocxTheme == type)
 		{
-			smart_ptr<PPTX::Theme> pTheme = new PPTX::Theme();
+			smart_ptr<PPTX::Theme> pTheme = new PPTX::Theme(NULL);
 			pTheme->fromPPTY(&m_oBufferedStream);
 			NSBinPptxRW::CXmlWriter xmlWriter;
 			pTheme->toXmlWriter(&xmlWriter);
@@ -2942,7 +3010,7 @@ public:
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
-	};
+	}
 	int ReadImageMapContent(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
@@ -2985,7 +3053,7 @@ public:
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
-	};
+	}
 };
 class Binary_CommentsTableReader : public Binary_CommonReader<Binary_CommentsTableReader>
 {
@@ -3039,6 +3107,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));
@@ -3688,6 +3761,33 @@ public:
             res = Read2(length, &Binary_DocumentTableReader::Read_Background, this, &oBackground);
             m_oDocumentWriter.m_oBackground.WriteString(oBackground.Write());
         }
+		else if ( c_oSerParType::BookmarkStart == type )
+		{
+			OOX::Logic::CBookmarkStart oBookmarkStart;
+			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkStart, this, &oBookmarkStart);
+			m_oDocumentWriter.m_oContent.WriteString(oBookmarkStart.toXML());
+		}
+		else if ( c_oSerParType::BookmarkEnd == type )
+		{
+			OOX::Logic::CBookmarkEnd oBookmarkEnd;
+			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkEnd, this, &oBookmarkEnd);
+			m_oDocumentWriter.m_oContent.WriteString(oBookmarkEnd.toXML());
+		}
+		else if(c_oSerParType::JsaProject == type)
+		{
+			BYTE* pData = m_oBufferedStream.GetPointer(length);
+			OOX::CPath sJsaProject = OOX::FileTypes::JsaProject.DefaultFileName();
+			std::wstring filePath = m_oFileWriter.m_oDocumentWriter.m_sDir + FILE_SEPARATOR_STR + L"word"+ FILE_SEPARATOR_STR + sJsaProject.GetPath();
+
+			NSFile::CFileBinary oFile;
+			oFile.CreateFileW(filePath);
+			oFile.WriteFile(pData, length);
+			oFile.CloseFile();
+
+			long lId;
+			m_oFileWriter.m_pDrawingConverter->WriteRels(OOX::FileTypes::JsaProject.RelationType(), sJsaProject.GetPath(), L"", &lId);
+			m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_pContentTypes->AddDefault(sJsaProject.GetExtention(false));
+		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -3826,6 +3926,18 @@ public:
 			SdtWraper oSdt(1);
 			res = Read1(length, &Binary_DocumentTableReader::ReadSdt, this, &oSdt);
 		}
+		else if ( c_oSerParType::BookmarkStart == type )
+		{
+			OOX::Logic::CBookmarkStart oBookmarkStart;
+			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkStart, this, &oBookmarkStart);
+			m_oDocumentWriter.m_oContent.WriteString(oBookmarkStart.toXML());
+		}
+		else if ( c_oSerParType::BookmarkEnd == type )
+		{
+			OOX::Logic::CBookmarkEnd oBookmarkEnd;
+			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkEnd, this, &oBookmarkEnd);
+			m_oDocumentWriter.m_oContent.WriteString(oBookmarkEnd.toXML());
+		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -3983,6 +4095,19 @@ public:
 			res = c_oSerConstants::ReadUnknown;
 		return res;
 	}
+	int ReadFldChar(BYTE type, long length, void* poResult)
+	{
+		int res = c_oSerConstants::ReadOk;
+		OOX::Logic::CFldChar* pFldChar = static_cast<OOX::Logic::CFldChar*>(poResult);
+		if ( c_oSer_FldSimpleType::CharType == type )
+		{
+			pFldChar->m_oFldCharType.Init();
+			pFldChar->m_oFldCharType->SetValue((SimpleTypes::EFldCharType)m_oBufferedStream.GetUChar());
+		}
+		else
+			res = c_oSerConstants::ReadUnknown;
+		return res;
+	}
 	int ReadFldSimple(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
@@ -4208,6 +4333,57 @@ public:
 			res = c_oSerConstants::ReadUnknown;
 		return res;
 	}
+	int ReadBookmarkStart(BYTE type, long length, void* poResult)
+	{
+		int res = c_oSerConstants::ReadOk;
+		OOX::Logic::CBookmarkStart* pBookmarkStart = static_cast<OOX::Logic::CBookmarkStart*>(poResult);
+		if ( c_oSerBookmark::Id == type )
+		{
+			pBookmarkStart->m_oId.Init();
+			pBookmarkStart->m_oId->SetValue(m_oBufferedStream.GetLong());
+		}
+		else if ( c_oSerBookmark::Name == type )
+		{
+			pBookmarkStart->m_sName.Init();
+			pBookmarkStart->m_sName->append(m_oBufferedStream.GetString3(length));
+		}
+		else if ( c_oSerBookmark::DisplacedByCustomXml == type )
+		{
+			pBookmarkStart->m_oDisplacedByCustomXml.Init();
+			pBookmarkStart->m_oDisplacedByCustomXml->SetValue((SimpleTypes::EDisplacedByCustomXml)m_oBufferedStream.GetUChar());
+		}
+		else if ( c_oSerBookmark::ColFirst == type )
+		{
+			pBookmarkStart->m_oColFirst.Init();
+			pBookmarkStart->m_oColFirst->SetValue(m_oBufferedStream.GetLong());
+		}
+		else if ( c_oSerBookmark::ColLast == type )
+		{
+			pBookmarkStart->m_oColLast.Init();
+			pBookmarkStart->m_oColLast->SetValue(m_oBufferedStream.GetLong());
+		}
+		else
+			res = c_oSerConstants::ReadUnknown;
+		return res;
+	}
+	int ReadBookmarkEnd(BYTE type, long length, void* poResult)
+	{
+		int res = c_oSerConstants::ReadOk;
+		OOX::Logic::CBookmarkEnd* pBookmarkEnd = static_cast<OOX::Logic::CBookmarkEnd*>(poResult);
+		if ( c_oSerBookmark::Id == type )
+		{
+			pBookmarkEnd->m_oId.Init();
+			pBookmarkEnd->m_oId->SetValue(m_oBufferedStream.GetLong());
+		}
+		else if ( c_oSerBookmark::DisplacedByCustomXml == type )
+		{
+			pBookmarkEnd->m_oDisplacedByCustomXml.Init();
+			pBookmarkEnd->m_oDisplacedByCustomXml->SetValue((SimpleTypes::EDisplacedByCustomXml)m_oBufferedStream.GetUChar());
+		}
+		else
+			res = c_oSerConstants::ReadUnknown;
+		return res;
+	}
 
 	int ReadHyperlink(BYTE type, long length, void* poResult)
 	{		
@@ -4401,6 +4577,18 @@ public:
 			res = Read1(length, &Binary_DocumentTableReader::ReadMathSSup, this, poResult);
             GetRunStringWriter().WriteString(std::wstring(_T("</m:sSup>")));
 		}
+		else if ( c_oSer_OMathContentType::BookmarkStart == type )
+		{
+			OOX::Logic::CBookmarkStart oBookmarkStart;
+			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkStart, this, &oBookmarkStart);
+			GetRunStringWriter().WriteString(oBookmarkStart.toXML());
+		}
+		else if ( c_oSer_OMathContentType::BookmarkEnd == type )
+		{
+			OOX::Logic::CBookmarkEnd oBookmarkEnd;
+			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkEnd, this, &oBookmarkEnd);
+			GetRunStringWriter().WriteString(oBookmarkEnd.toXML());
+		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -6609,7 +6797,7 @@ public:
 			//сбрасываем Shd
             oBinary_tblPrReader.m_sCurTableShd.clear();
 		}
-		else if(c_oSerRunType::fldstart == type)
+		else if(c_oSerRunType::fldstart_deprecated == type)
 		{
             std::wstring sField(m_oBufferedStream.GetString3(length));
 			sField = XmlUtils::EncodeXmlString(sField);
@@ -6623,7 +6811,7 @@ public:
 				m_oCur_rPr.Write(&GetRunStringWriter());
             GetRunStringWriter().WriteString(std::wstring(_T("<w:fldChar w:fldCharType=\"separate\"/>")));
 		}
-		else if(c_oSerRunType::fldend == type)
+		else if(c_oSerRunType::fldend_deprecated == type)
 		{
             GetRunStringWriter().WriteString(std::wstring(_T("<w:fldChar w:fldCharType=\"end\"/>")));
 		}
@@ -6672,6 +6860,28 @@ public:
 			res = Read1(length, &Binary_DocumentTableReader::ReadEndnoteRef, this, &oEndnoteRef);
 			GetRunStringWriter().WriteString(oEndnoteRef.toXML());
 		}
+		else if ( c_oSerRunType::fldChar == type)
+		{
+			OOX::Logic::CFldChar oFldChar;
+			res = Read1(length, &Binary_DocumentTableReader::ReadFldChar, this, &oFldChar);
+			GetRunStringWriter().WriteString(oFldChar.toXML());
+		}
+		else if ( c_oSerRunType::instrText == type)
+		{
+			GetRunStringWriter().WriteString(std::wstring(_T("<w:instrText xml:space=\"preserve\">")));
+			std::wstring sText(m_oBufferedStream.GetString3(length));
+			sText = XmlUtils::EncodeXmlString(sText);
+			GetRunStringWriter().WriteString(sText);
+			GetRunStringWriter().WriteString(std::wstring(_T("</w:instrText>")));
+		}
+		else if ( c_oSerRunType::delInstrText == type)
+		{
+			GetRunStringWriter().WriteString(std::wstring(_T("<w:delInstrText xml:space=\"preserve\">")));
+			std::wstring sText(m_oBufferedStream.GetString3(length));
+			sText = XmlUtils::EncodeXmlString(sText);
+			GetRunStringWriter().WriteString(sText);
+			GetRunStringWriter().WriteString(std::wstring(_T("</w:delInstrText>")));
+		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -6770,7 +6980,7 @@ public:
 		{
 			CWiterTblPr oWiterTblPr;
 			oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr);
-			pCStringWriter->WriteString(oWiterTblPr.Write(false, true));
+			pCStringWriter->WriteString(oWiterTblPr.Write());
 		}
 		else if( c_oSerDocTableType::tblGrid == type )
 		{
@@ -6842,6 +7052,18 @@ public:
 			SdtWraper oSdt(2);
 			res = Read1(length, &Binary_DocumentTableReader::ReadSdt, this, &oSdt);
 		}
+		else if (c_oSerDocTableType::BookmarkStart == type)
+		{
+			OOX::Logic::CBookmarkStart oBookmarkStart;
+			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkStart, this, &oBookmarkStart);
+			pCStringWriter->WriteString(oBookmarkStart.toXML());
+		}
+		else if (c_oSerDocTableType::BookmarkEnd == type)
+		{
+			OOX::Logic::CBookmarkEnd oBookmarkEnd;
+			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkEnd, this, &oBookmarkEnd);
+			pCStringWriter->WriteString(oBookmarkEnd.toXML());
+		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -6879,6 +7101,18 @@ public:
 			SdtWraper oSdt(3);
 			res = Read1(length, &Binary_DocumentTableReader::ReadSdt, this, &oSdt);
 		}
+		else if (c_oSerDocTableType::BookmarkStart == type)
+		{
+			OOX::Logic::CBookmarkStart oBookmarkStart;
+			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkStart, this, &oBookmarkStart);
+			pCStringWriter->WriteString(oBookmarkStart.toXML());
+		}
+		else if (c_oSerDocTableType::BookmarkEnd == type)
+		{
+			OOX::Logic::CBookmarkEnd oBookmarkEnd;
+			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkEnd, this, &oBookmarkEnd);
+			pCStringWriter->WriteString(oBookmarkEnd.toXML());
+		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -7017,13 +7251,13 @@ public:
 		{
 			if(false == m_oFileWriter.m_bSaveChartAsImg)
 			{
-				OOX::CPath pathChartsDir = m_oFileWriter.m_oChartWriter.m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR +_T("charts");
+				OOX::CPath pathChartsDir = m_oFileWriter.m_oChartWriter.m_sDir + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"charts";
 				OOX::CSystemUtility::CreateDirectories(pathChartsDir.GetPath());
 				
-				OOX::CPath pathChartsRelsDir = pathChartsDir.GetPath() + FILE_SEPARATOR_STR +  _T("_rels");                
+				OOX::CPath pathChartsRelsDir = pathChartsDir.GetPath() + FILE_SEPARATOR_STR +  L"_rels";                
 				OOX::CSystemUtility::CreateDirectories(pathChartsRelsDir.GetPath());
 
-				OOX::CPath pathChartsWorksheetDir = m_oFileWriter.m_oChartWriter.m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR +_T("embeddings");
+				OOX::CPath pathChartsWorksheetDir = m_oFileWriter.m_oChartWriter.m_sDir + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"embeddings";
 				OOX::CSystemUtility::CreateDirectories(pathChartsWorksheetDir.GetPath());
 
                 int nativeDocumentType = m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_nDocumentType;
@@ -7034,7 +7268,7 @@ public:
 				BinXlsxRW::SaveParams			oSaveParams(m_oFileWriter.m_sThemePath, m_oFileWriter.m_pDrawingConverter->GetContentTypes());
 				BinXlsxRW::BinaryChartReader	oBinaryChartReader(m_oBufferedStream, oSaveParams, m_oFileWriter.m_pDrawingConverter);
 				
-				OOX::Spreadsheet::CChartSpace* pChartSpace = new OOX::Spreadsheet::CChartSpace();
+				OOX::Spreadsheet::CChartSpace* pChartSpace = new OOX::Spreadsheet::CChartSpace(NULL);
 				oBinaryChartReader.ReadCT_ChartSpace(length, &pChartSpace->m_oChartSpace);
 
 				//save xlsx
@@ -7044,21 +7278,22 @@ public:
 				std::wstring sXlsxFilename = L"Microsoft_Excel_Worksheet" + std::to_wstring(nChartIndex) + L".xlsx";
 				std::wstring sXlsxPath = pathChartsWorksheetDir.GetPath() + FILE_SEPARATOR_STR + sXlsxFilename;
 				BinXlsxRW::CXlsxSerializer oXlsxSerializer;
-				oXlsxSerializer.writeChartXlsx(sXlsxPath, *pChartSpace);
+				if (oXlsxSerializer.writeChartXlsx(sXlsxPath, *pChartSpace))
+				{
+					std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
+					long rIdXlsx;
+					std::wstring bstrChartsWorksheetRelType = OOX::FileTypes::MicrosoftOfficeExcelWorksheet.RelationType();
 
-				std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
-				long rIdXlsx;
-                std::wstring bstrChartsWorksheetRelType = OOX::FileTypes::MicrosoftOfficeExcelWorksheet.RelationType();
-                
-				m_oFileWriter.m_pDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &rIdXlsx);
-				m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_pContentTypes->AddDefault(L"xlsx");
-				
-				pChartSpace->m_oChartSpace.m_externalData = new OOX::Spreadsheet::CT_ExternalData();
-				pChartSpace->m_oChartSpace.m_externalData->m_id = new std::wstring();
-				pChartSpace->m_oChartSpace.m_externalData->m_id->append(L"rId");
-				pChartSpace->m_oChartSpace.m_externalData->m_id->append(std::to_wstring(rIdXlsx));
-				pChartSpace->m_oChartSpace.m_externalData->m_autoUpdate = new OOX::Spreadsheet::CT_Boolean();
-				pChartSpace->m_oChartSpace.m_externalData->m_autoUpdate->m_val = new bool(false);
+					m_oFileWriter.m_pDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &rIdXlsx);
+					m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_pContentTypes->AddDefault(L"xlsx");
+
+					pChartSpace->m_oChartSpace.m_externalData = new OOX::Spreadsheet::CT_ExternalData();
+					pChartSpace->m_oChartSpace.m_externalData->m_id = new std::wstring();
+					pChartSpace->m_oChartSpace.m_externalData->m_id->append(L"rId");
+					pChartSpace->m_oChartSpace.m_externalData->m_id->append(std::to_wstring(rIdXlsx));
+					pChartSpace->m_oChartSpace.m_externalData->m_autoUpdate = new OOX::Spreadsheet::CT_Boolean();
+					pChartSpace->m_oChartSpace.m_externalData->m_autoUpdate->m_val = new bool(false);
+				}
 
 			//save chart.xml
 				NSStringUtils::CStringBuilder sw;
@@ -7214,6 +7449,8 @@ public:
 		{
 			PPTX::Logic::CNvPr pNonVisualDrawingProps(L"wp");
 			res = Read1(length, &Binary_DocumentTableReader::ReadDocPr, this, &pNonVisualDrawingProps);
+			
+			pNonVisualDrawingProps.id = pDrawingProperty->m_nDocPr;
 			pDrawingProperty->sDocPr = pNonVisualDrawingProps.toXML2(L"wp:docPr");
 		}
 		else
@@ -7917,9 +8154,9 @@ public:
 
 		int res = ReadTable(&Binary_NotesTableReader::ReadNotes, this, &oBinary_DocumentTableReader);
 
-		OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir +	FILE_SEPARATOR_STR + _T("word") +
-																			FILE_SEPARATOR_STR + _T("_rels")+
-																			FILE_SEPARATOR_STR + sFilename + _T(".rels");
+		OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir +	FILE_SEPARATOR_STR + L"word" +
+																			FILE_SEPARATOR_STR + L"_rels"+
+																			FILE_SEPARATOR_STR + sFilename + L".rels";
 
 		m_oFileWriter.m_pDrawingConverter->SaveDstContentRels(fileRelsPath.GetPath());
 		return res;
@@ -7956,33 +8193,33 @@ public:
 			XmlUtils::CStringWriter& writer = pBinary_DocumentTableReader->m_oDocumentWriter.m_oContent;
 			if(m_bIsFootnote)
 			{
-				writer.WriteString(_T("<w:footnote"));
+				writer.WriteString(L"<w:footnote");
 			}
 			else
 			{
-				writer.WriteString(_T("<w:endnote"));
+				writer.WriteString(L"<w:endnote");
 			}
 			if(m_oType.IsInit())
 			{
-				writer.WriteString(_T(" w:type=\""));
+				writer.WriteString(L" w:type=\"");
 				writer.WriteString(m_oType->ToString());
-				writer.WriteString(_T("\""));
+				writer.WriteString(L"\"");
 			}
 			if(m_oId.IsInit())
 			{
-				writer.WriteString(_T(" w:id=\""));
+				writer.WriteString(L" w:id=\"");
 				writer.WriteString(m_oId->ToString());
-				writer.WriteString(_T("\""));
+				writer.WriteString(L"\"");
 			}
-			writer.WriteString(_T(">"));
+			writer.WriteString(L">");
 			res = Read1(length, &Binary_NotesTableReader::ReadNoteContent, this, poResult);
 			if(m_bIsFootnote)
 			{
-				writer.WriteString(_T("</w:footnote>"));
+				writer.WriteString(L"</w:footnote>");
 			}
 			else
 			{
-				writer.WriteString(_T("</w:endnote>"));
+				writer.WriteString(L"</w:endnote>");
 			}
 		}
 		else
@@ -8082,8 +8319,8 @@ public:
 			}
 			else
 			{
-				m_oFileWriter.m_oSettingWriter.AddSetting(_T("<w:defaultTabStop w:val=\"708\"/>"));
-                std::wstring sClrMap(_T("<w:clrSchemeMapping w:bg1=\"light1\" w:t1=\"dark1\" w:bg2=\"light2\" w:t2=\"dark2\" w:accent1=\"accent1\" w:accent2=\"accent2\" w:accent3=\"accent3\" w:accent4=\"accent4\" w:accent5=\"accent5\" w:accent6=\"accent6\" w:hyperlink=\"hyperlink\" w:followedHyperlink=\"followedHyperlink\"/>"));
+				m_oFileWriter.m_oSettingWriter.AddSetting(L"<w:defaultTabStop w:val=\"708\"/>");
+                std::wstring sClrMap(L"<w:clrSchemeMapping w:bg1=\"light1\" w:t1=\"dark1\" w:bg2=\"light2\" w:t2=\"dark2\" w:accent1=\"accent1\" w:accent2=\"accent2\" w:accent3=\"accent3\" w:accent4=\"accent4\" w:accent5=\"accent5\" w:accent6=\"accent6\" w:hyperlink=\"hyperlink\" w:followedHyperlink=\"followedHyperlink\"/>");
 				m_oFileWriter.m_oSettingWriter.AddSetting(sClrMap);
 				m_oFileWriter.m_pDrawingConverter->LoadClrMap(sClrMap);
 			}
@@ -8135,9 +8372,12 @@ public:
 					case c_oSerTableTypes::Endnotes:
 						res = Binary_NotesTableReader(m_oBufferedStream, m_oFileWriter, m_oFileWriter.m_pComments, false).Read();
 						break;
+					case c_oSerTableTypes::VbaProject:
+						res = Binary_VbaProjectTableReader(m_oBufferedStream, m_oFileWriter).Read();
+						break;
 
 					//Comments должны читаться раньше чем c_oSerTableTypes::Document
-					//case c_oSerTableTypes::Comments:
+					//case c_oSerTableTypes::Comments
 					//	res = oBinary_CommentsTableReader.Read();
 					//	break;
 					//case c_oSerTableTypes::Other:
@@ -8160,7 +8400,18 @@ public:
                 m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable",	L"fontTable.xml",	L"", &stamdartRId);
                 m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme",		L"theme/theme1.xml",L"", &stamdartRId);
                
-				m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",	L"/word",		L"document.xml");
+				if (m_oFileWriter.m_pVbaProject.IsInit())
+				{
+					//m_oFileWriter.m_pVbaProject->write();
+					m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.microsoft.com/office/2006/relationships/vbaProject",		L"vbaProject.bin", L"", &stamdartRId);
+					
+					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.ms-word.document.macroEnabled.main+xml",	L"/word",		L"document.xml");
+					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.ms-office.vbaProject",					L"/word",		L"vbaProject.bin");
+				}
+				else
+				{
+					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",	L"/word",		L"document.xml");
+				}
 				m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml",			L"/word",		L"styles.xml");
 				m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml",			L"/word",		L"settings.xml");
 				m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml",		L"/word",		L"webSettings.xml");
@@ -8170,19 +8421,19 @@ public:
 				if(false == m_oFileWriter.m_oNumberingWriter.IsEmpty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering")), std::wstring(_T("numbering.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering", L"numbering.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml", L"/word", L"numbering.xml");
 				}
                 if(false == m_oFileWriter.m_oFootnotesWriter.IsEmpty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes")), std::wstring(_T("footnotes.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes", L"footnotes.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml", L"/word", L"footnotes.xml");
 				}
                 if(false == m_oFileWriter.m_oEndnotesWriter.IsEmpty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes")), std::wstring(_T("endnotes.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes", L"endnotes.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml", L"/word", L"endnotes.xml");
 				}
 				for(size_t i = 0; i < m_oFileWriter.m_oHeaderFooterWriter.m_aHeaders.size(); ++i)
@@ -8191,7 +8442,7 @@ public:
 					if(false == pHeader->IsEmpty())
 					{
 						long rId;
-                        m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/header")), pHeader->m_sFilename, std::wstring(), &rId);
+                        m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/header", pHeader->m_sFilename, std::wstring(), &rId);
                         pHeader->rId = L"rId" + std::to_wstring( rId );
 						
 						m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml", L"/word", pHeader->m_sFilename);
@@ -8203,7 +8454,7 @@ public:
 					if(false == pFooter->IsEmpty())
 					{
 						long rId;
-                        m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer")), pFooter->m_sFilename, std::wstring(), &rId);
+                        m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer", pFooter->m_sFilename, std::wstring(), &rId);
                         pFooter->rId = L"rId" + std::to_wstring( rId );
 						
 						m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml", L"/word", pFooter->m_sFilename);
@@ -8211,9 +8462,9 @@ public:
 				}
 				res = Binary_DocumentTableReader(m_oBufferedStream, m_oFileWriter, m_oFileWriter.m_oDocumentWriter, &oBinary_CommentsTableReader.m_oComments).Read();
 
-                OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir	+ FILE_SEPARATOR_STR + _T("word")
-																					+ FILE_SEPARATOR_STR + _T("_rels")
-																					+ FILE_SEPARATOR_STR + _T("document.xml.rels");
+                OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir	+ FILE_SEPARATOR_STR + L"word"
+																					+ FILE_SEPARATOR_STR + L"_rels"
+																					+ FILE_SEPARATOR_STR + L"document.xml.rels";
 
                 CComments& oComments= oBinary_CommentsTableReader.m_oComments;
 				Writers::CommentsWriter& oCommentsWriter = m_oFileWriter.m_oCommentsWriter;
@@ -8227,19 +8478,19 @@ public:
 				if(false == oCommentsWriter.m_sComment.empty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments")), std::wstring(_T("comments.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments", L"comments.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml", L"/word", L"comments.xml");
 				}
                 if(false == oCommentsWriter.m_sCommentExt.empty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.microsoft.com/office/2011/relationships/commentsExtended")), std::wstring(_T("commentsExtended.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.microsoft.com/office/2011/relationships/commentsExtended", L"commentsExtended.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml", L"/word", L"commentsExtended.xml");
 				}
                 if(false == oCommentsWriter.m_sPeople.empty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.microsoft.com/office/2011/relationships/people")), std::wstring(_T("people.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.microsoft.com/office/2011/relationships/people", L"people.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.people+xml", L"/word", L"people.xml");
 				}
 

ASCOfficeDocxFile2/BinReader/fontTableWriter.h

@@ -35,6 +35,7 @@
 #include "../../XlsxSerializerCom/Common/Common.h"
 #include "../../DesktopEditor/fontengine/FontManager.h"
 #include "../../DesktopEditor/fontengine/ApplicationFonts.h"
+#include <boost/unordered_map.hpp>
 
 namespace Writers
 {
@@ -48,7 +49,7 @@ namespace Writers
         CApplicationFonts       m_oApplicationFonts;
         CFontManager*           m_pFontManager;
 	public:
-        std::map<std::wstring, int> m_mapFonts;
+        boost::unordered_map<std::wstring, int> m_mapFonts;
 
 		FontTableWriter(std::wstring sDir, std::wstring sFontDir, bool bNoFontDir):m_sDir(sDir)
 		{
@@ -81,7 +82,7 @@ namespace Writers
 			bool bCalibri = false;
 			bool bTimes = false;
 			bool bCambria = false;
-            for (std::map<std::wstring, int>::const_iterator it = m_mapFonts.begin(); it != m_mapFonts.end(); ++it)
+            for (boost::unordered_map<std::wstring, int>::const_iterator it = m_mapFonts.begin(); it != m_mapFonts.end(); ++it)
 			{
                 const std::wstring& sFontName = it->first;
 				if(_T("Calibri") == sFontName)

ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h

@@ -144,9 +144,13 @@ namespace MathEquation
 			void AddAccent (MEMBELTYPE eType)
 			{
 				LONG lPos = GetSize() - 1;
+
+				if (lPos < 0) return;
+				
 				EquationRun oRun;
 				oRun = arrRun[lPos];
 				RemoveElem(lPos);
+				
 				oRun.bAccent = true;
 				oRun.eType = eType;
 				Add(oRun);
@@ -557,11 +561,11 @@ namespace MathEquation
 				BYTE horAlign;
 				switch(eHorAlign)
 				{
-					case matrixhoralignLeft:		horAlign = SimpleTypes::xalignLeft;
-					case matrixhoralignCenter:		horAlign = SimpleTypes::xalignCenter;
-					case matrixhoralignRight:		horAlign = SimpleTypes::xalignRight;
-					case matrixhoralignEqualSign:	horAlign = SimpleTypes::xalignCenter;
-					case matrixhoralignCommaSign:	horAlign = SimpleTypes::xalignCenter;
+					case matrixhoralignLeft:		horAlign = SimpleTypes::xalignLeft;		break;
+					case matrixhoralignCenter:		horAlign = SimpleTypes::xalignCenter;	break;
+					case matrixhoralignRight:		horAlign = SimpleTypes::xalignRight;	break;
+					case matrixhoralignEqualSign:	horAlign = SimpleTypes::xalignCenter;	break;
+					case matrixhoralignCommaSign:	horAlign = SimpleTypes::xalignCenter;	break;
 				}
 				WriteItemVal(BinDocxRW::c_oSer_OMathBottomNodesType::McJc, horAlign);
 
@@ -614,7 +618,7 @@ namespace MathEquation
                         nRows = m_aRowsCounter.top();
                         m_aRowsCounter.pop();
                     }
-                    int nPos = 0;
+                    int nPos = m_oStream.GetPosition();
                     if (!m_aRowsPosCounter.empty())
                     {
                         nPos = m_aRowsPosCounter.top();
@@ -1675,7 +1679,7 @@ namespace MathEquation
 
 			void WriteEndNode(BinaryEquationWriter* pWriter)
 			{
-				int nCurPos;
+				int nCurPos = -1;
 				if (!m_aBaseStack.empty())
 				{
 					nCurPos = m_aBaseStack.top();
@@ -1687,14 +1691,20 @@ namespace MathEquation
 				}
 
 				if (bPile && bEqArrayStart)
+				{
 					pWriter->WriteItemEnd(nCurPos);
+				}
 				else if (!bPile && !bEqArrayStart)
+				{
 					pWriter->WriteItemEnd(nCurPos);
+				}
 				else if (!bPile && bEqArrayStart)
 				{					
 					pWriter->m_aRowsCounter.push(nRows);
 					bEqArrayStart = false;
-					pWriter->WriteItemEnd(nCurPos);//eqArr
+					
+					if (nCurPos > 0)
+						pWriter->WriteItemEnd(nCurPos);//eqArr
 
 					if (!m_aBaseStack.empty())
 					{

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
 	{
@@ -141,19 +142,20 @@ extern int g_nCurFormatVersion;
 	};}
 	namespace c_oSerTableTypes{enum c_oSerTableTypes
 	{
-		Signature = 0,
-		Info = 1,
-		Media = 2,
-		Numbering = 3,
-		HdrFtr = 4,
-		Style = 5,
-		Document = 6,
-		Other = 7,
-		Comments = 8,
-		Settings = 9,
-		Footnotes = 10,
-		Endnotes = 11,
-		Background
+		Signature	= 0,
+		Info		= 1,
+		Media		= 2,
+		Numbering	= 3,
+		HdrFtr		= 4,
+		Style		= 5,
+		Document	= 6,
+		Other		= 7,
+		Comments	= 8,
+		Settings	= 9,
+		Footnotes	= 10,
+		Endnotes	= 11,
+		Background	= 12,
+		VbaProject	= 13
 	};}
 	namespace c_oSerSigTypes{enum c_oSerSigTypes
 	{
@@ -202,10 +204,10 @@ extern int g_nCurFormatVersion;
 	};}
 	namespace c_oSerOtherTableTypes{enum c_oSerOtherTableTypes
 	{
-		ImageMap = 0,
-		ImageMap_Src = 1,
-		EmbeddedFonts = 2,
-		DocxTheme = 3
+		ImageMap		= 0,
+		ImageMap_Src	= 1,
+		EmbeddedFonts	= 2,
+		DocxTheme		= 3
 	};}
 	namespace c_oSerFontsTypes{enum c_oSerFontsTypes
 	{
@@ -342,7 +344,9 @@ extern int g_nCurFormatVersion;
 		FramePr = 30,
 		SectPr = 31,
 		numPr_Ins =  32,
-		pPrChange = 33
+		pPrChange = 33,
+		outlineLvl = 34,
+		Tab_Item_Leader = 35
 	};}
 	namespace c_oSerProp_rPrType{enum c_oSerProp_rPrType
 	{
@@ -472,7 +476,11 @@ extern int g_nCurFormatVersion;
 		MoveFromRangeStart = 18,
 		MoveFromRangeEnd = 19,
 		MoveToRangeStart = 20,
-		MoveToRangeEnd = 21
+		MoveToRangeEnd = 21,
+		JsaProject = 22,
+		BookmarkStart = 23,
+		BookmarkEnd = 24
+
 	};}
 	namespace c_oSerDocTableType{enum c_oSerDocTableType
 	{
@@ -487,7 +495,9 @@ extern int g_nCurFormatVersion;
 		Cell_Pr =  7,
 		Cell_Content =  8,
 		tblGridChange = 9,
-		Sdt = 10
+		Sdt = 10,
+		BookmarkStart = 11,
+		BookmarkEnd = 12
 	};}
 	namespace c_oSerRunType{enum c_oSerRunType
 	{
@@ -500,8 +510,8 @@ extern int g_nCurFormatVersion;
 		image = 6,
 		table = 7,
 		Content = 8,
-		fldstart = 9,
-		fldend = 10,
+		fldstart_deprecated = 9,
+		fldend_deprecated = 10,
 		CommentReference = 11,
 		pptxDrawing = 12,
         object = 14,
@@ -518,7 +528,14 @@ extern int g_nCurFormatVersion;
 		endnoteRef = 25,
 		footnoteReference = 26,
 		endnoteReference = 27,
-		arPr = 28
+		arPr = 28,
+		fldChar = 29,
+		instrText = 30,
+		delInstrText = 31
+	};}
+	namespace c_oSerVbaProjectTypes{enum c_oSerVbaProjectType
+	{
+		Name = 0
 	};}
     namespace c_oSerBackgroundType{enum c_oSerBackgroundType
 	{
@@ -715,7 +732,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
 	{
@@ -888,7 +906,9 @@ extern int g_nCurFormatVersion;
 		Ins = 62,
 		Del = 63,
 		columnbreak = 64,
-		ARPr = 65
+		ARPr = 65,
+		BookmarkStart = 66,
+		BookmarkEnd = 67
 	};}
 	namespace c_oSer_FramePrType{ enum c_oSer_FramePrType
 	{		
@@ -921,7 +941,8 @@ extern int g_nCurFormatVersion;
 	{
 		Content = 0,
 		Instr = 1,
-		FFData = 2
+		FFData = 2,
+		CharType = 3
 	};}
 	namespace c_oSer_ColorThemeType{ enum c_oSer_ColorThemeType
 	{
@@ -1092,6 +1113,14 @@ extern int g_nCurFormatVersion;
 		Name = 6,
 		UserId = 7
 	};}
+	namespace c_oSerBookmark{enum c_oSerBookmark
+	{
+		Id = 0,
+		Name = 1,
+		DisplacedByCustomXml = 2,
+		ColFirst = 3,
+		ColLast = 4
+	};}
 }
 
 #endif	// #ifndef DOCX_BIN_READER_WRITER_DEFINES

ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp

@@ -32,7 +32,12 @@
 #include "ChartWriter.h"
 
 #include <algorithm>
+
 #include "../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/SharedStrings/SharedStrings.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/Styles/Styles.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.h"
 
 #define NUMID_START 160
 const wchar_t* gc_Cat = L"cat";
@@ -127,10 +132,11 @@ namespace BinXlsxRW{
 	}
 	ChartWriter::~ChartWriter()
 	{
-		for (std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); it++)
+        for (std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); ++it)
 		{
-			std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = it->second;
-			for(std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::iterator itRow = rows->begin(); itRow != rows->end(); itRow++)
+            std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = it->second;
+
+            for(std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::iterator itRow = rows->begin(); itRow != rows->end(); itRow++)
 			{
 				delete itRow->second;
 			}
@@ -140,28 +146,34 @@ namespace BinXlsxRW{
 	void ChartWriter::toXlsx(OOX::Spreadsheet::CXlsx& oXlsx)
 	{
 		std::vector<std::wstring> aSharedStrings;
-		//Sheet
-		OOX::Spreadsheet::CWorkbook* pWorkbook = oXlsx.CreateWorkbook();
-		pWorkbook->m_oSheets.Init();
-		std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets = oXlsx.GetWorksheets();
+		
+		oXlsx.CreateWorkbook();
+		oXlsx.m_pWorkbook->m_oSheets.Init();
+
 		int nSheetId = 1;
 		OOX::Spreadsheet::CWorksheet* pFirstWorksheet = NULL;
-		for (std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); it++)
+
+        for (std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); ++it)
 		{
 			const std::wstring& sSheetName = it->first;
-			OOX::Spreadsheet::CWorksheet* pWorksheet = toXlsxGetSheet(mapWorksheets, sSheetName);
+			
+			//find or generate black worksheet
+			OOX::Spreadsheet::CWorksheet* pWorksheet = toXlsxGetSheet(oXlsx.m_arWorksheets, oXlsx.m_mapWorksheets, sSheetName);
+			//fill data to worksheet
 			toXlsxSheetdata(pWorksheet, *it->second, aSharedStrings);
+			
 			OOX::Spreadsheet::CSheet* pSheet = new OOX::Spreadsheet::CSheet();
 			pSheet->m_oName.Init();
 			pSheet->m_oName->append(sSheetName);
 			pSheet->m_oSheetId.Init();
 			pSheet->m_oSheetId->SetValue(nSheetId++);
+			
 			smart_ptr<OOX::File> oWorksheetFile = smart_ptr<OOX::File>(pWorksheet);
-			const OOX::RId oRId = pWorkbook->Add(oWorksheetFile);
+			const OOX::RId oRId = oXlsx.m_pWorkbook->Add(oWorksheetFile);
 			pSheet->m_oRid.Init();
 			pSheet->m_oRid->SetValue(oRId.get());
-			pWorkbook->m_oSheets->m_arrItems.push_back(pSheet);
-			mapWorksheets[pSheet->m_oName.get()] = pWorksheet;
+			
+			oXlsx.m_pWorkbook->m_oSheets->m_arrItems.push_back(pSheet);
 
 			if(NULL == pFirstWorksheet)
 			{
@@ -170,7 +182,7 @@ namespace BinXlsxRW{
 		}
 
 		//SharedStrings
-		OOX::Spreadsheet::CSharedStrings* pSharedStrings = oXlsx.CreateSharedStrings();
+		oXlsx.CreateSharedStrings();
 		for(size_t i = 0; i < aSharedStrings.size(); ++i)
 		{
 			OOX::Spreadsheet::CText* pText = new OOX::Spreadsheet::CText();
@@ -182,33 +194,35 @@ namespace BinXlsxRW{
 			}
 			OOX::Spreadsheet::CSi* pSi = new OOX::Spreadsheet::CSi();
 			pSi->m_arrItems.push_back(pText);
-			pSharedStrings->m_arrItems.push_back(pSi);
+			oXlsx.m_pSharedStrings->AddSi(pSi);
 		}
-		pSharedStrings->m_oCount.Init();
-		pSharedStrings->m_oCount->SetValue(pSharedStrings->m_arrItems.size());
-		pSharedStrings->m_oUniqueCount.Init();
-		pSharedStrings->m_oUniqueCount->SetValue(pSharedStrings->m_arrItems.size());
+		oXlsx.m_pSharedStrings->m_oCount.Init();
+		oXlsx.m_pSharedStrings->m_oCount->SetValue(oXlsx.m_pSharedStrings->m_nCount);
+		oXlsx.m_pSharedStrings->m_oUniqueCount.Init();
+		oXlsx.m_pSharedStrings->m_oUniqueCount->SetValue(oXlsx.m_pSharedStrings->m_nCount);
 		//Styles
-		OOX::Spreadsheet::CStyles* pStyles = oXlsx.CreateStyles();
-		pStyles->m_oCellXfs.Init();
+		oXlsx.CreateStyles();
+		oXlsx.m_pStyles->m_oCellXfs.Init();
 		for(size_t i = 0; i < m_aXfs.size(); ++i)
 		{
-			pStyles->m_oCellXfs->m_arrItems.push_back(m_aXfs[i]);
+			oXlsx.m_pStyles->m_oCellXfs->m_arrItems.push_back(m_aXfs[i]);
 		}
-		pStyles->m_oNumFmts.Init();
-		for (std::map<std::wstring, int>::iterator it = m_mapFormats.begin(); it != m_mapFormats.end(); it++)
+		oXlsx.m_pStyles->m_oNumFmts.Init();
+
+        for (boost::unordered_map<std::wstring, int>::iterator it = m_mapFormats.begin(); it != m_mapFormats.end(); ++it)
 		{
 			OOX::Spreadsheet::CNumFmt* pNumFmt = new OOX::Spreadsheet::CNumFmt();
 			pNumFmt->m_oFormatCode.Init();
 			pNumFmt->m_oFormatCode->append(it->first);
 			pNumFmt->m_oNumFmtId.Init();
 			pNumFmt->m_oNumFmtId->SetValue(NUMID_START + it->second);
-			pStyles->m_oNumFmts->m_arrItems.push_back(pNumFmt);
+			oXlsx.m_pStyles->m_oNumFmts->m_arrItems.push_back(pNumFmt);
 		}
-		pStyles->m_oNumFmts->m_oCount.Init();
-		pStyles->m_oNumFmts->m_oCount->SetValue(pStyles->m_oNumFmts->m_arrItems.size());
-		pStyles->m_oCellXfs->m_oCount.Init();
-		pStyles->m_oCellXfs->m_oCount->SetValue(pStyles->m_oCellXfs->m_arrItems.size());
+		oXlsx.m_pStyles->m_oNumFmts->m_oCount.Init();
+		oXlsx.m_pStyles->m_oNumFmts->m_oCount->SetValue(oXlsx.m_pStyles->m_oNumFmts->m_arrItems.size());
+		oXlsx.m_pStyles->m_oCellXfs->m_oCount.Init();
+		oXlsx.m_pStyles->m_oCellXfs->m_oCount->SetValue(oXlsx.m_pStyles->m_oCellXfs->m_arrItems.size());
+		
 		OOX::Spreadsheet::CDxf* pDxf = new OOX::Spreadsheet::CDxf();
 		pDxf->m_oBorder.Init();
 		pDxf->m_oBorder->m_oStart.Init();
@@ -235,15 +249,16 @@ namespace BinXlsxRW{
 		pDxf->m_oBorder->m_oBottom->m_oColor.Init();
 		pDxf->m_oBorder->m_oBottom->m_oColor->m_oIndexed.Init();
 		pDxf->m_oBorder->m_oBottom->m_oColor->m_oIndexed->SetValue(12);
-		pStyles->m_oDxfs.Init();
-		pStyles->m_oDxfs->m_arrItems.push_back(pDxf);
-		pStyles->m_oDxfs->m_oCount.Init();
-		pStyles->m_oDxfs->m_oCount->SetValue(pStyles->m_oDxfs->m_arrItems.size());
+		
+		oXlsx.m_pStyles->m_oDxfs.Init();
+		oXlsx.m_pStyles->m_oDxfs->m_arrItems.push_back(pDxf);
+		oXlsx.m_pStyles->m_oDxfs->m_oCount.Init();
+		oXlsx.m_pStyles->m_oDxfs->m_oCount->SetValue(oXlsx.m_pStyles->m_oDxfs->m_arrItems.size());
 		//Table
 		//todo table в случае нескольких sheet или если серии разнесены по sheet
 		if(m_aTableNames.size() > 0)
 		{
-			OOX::Spreadsheet::CTableFile* pTable = new OOX::Spreadsheet::CTableFile();
+			OOX::Spreadsheet::CTableFile* pTable = new OOX::Spreadsheet::CTableFile(NULL);
 			pTable->m_oTable.Init();
 			pTable->m_oTable->m_oDisplayName.Init();
 			pTable->m_oTable->m_oDisplayName->append(L"Table1");
@@ -286,9 +301,11 @@ namespace BinXlsxRW{
 			{
 				OOX::Spreadsheet::CTablePart* pTablePart = new OOX::Spreadsheet::CTablePart();
 				NSCommon::smart_ptr<OOX::File> pTableFile(pTable);
+				
 				const OOX::RId oRId = pFirstWorksheet->Add(pTableFile);
 				pTablePart->m_oRId.Init();
 				pTablePart->m_oRId->SetValue(oRId.get());
+				
 				pFirstWorksheet->m_oTableParts.Init();
 				pFirstWorksheet->m_oTableParts->m_arrItems.push_back(pTablePart);
 				pFirstWorksheet->m_oTableParts->m_oCount.Init();
@@ -458,18 +475,22 @@ namespace BinXlsxRW{
 		//проверяем можем ли создать таблицу
 		if(m_mapSheets.size() > 0 && m_nRow1 > 0 && m_nRow2 > 0 && m_nCol1 > 0 && m_nCol2 > 0 && m_nRow1 < m_nRow2)
 		{
-			std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = m_mapSheets.begin()->second;
-			std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::iterator itRows = rows->find(m_nRow1);
-			if(itRows != rows->end())
+            std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*            rows = m_mapSheets.begin()->second;
+            std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::iterator   itRows = rows->find(m_nRow1);
+
+            if(itRows != rows->end())
 			{
-				std::map<int, OOX::Spreadsheet::CCell*>* cells = itRows->second;
+                std::map<int, OOX::Spreadsheet::CCell*>* cells = itRows->second;
 				std::vector<int> aIndexesCell;
-				for(std::map<int, OOX::Spreadsheet::CCell*>::const_iterator it = cells->begin(); it != cells->end(); it++)
+
+                for(std::map<int, OOX::Spreadsheet::CCell*>::const_iterator it = cells->begin(); it != cells->end(); ++it)
 				{
 					aIndexesCell.push_back(it->first);
 				}
-				std::sort(aIndexesCell.begin(), aIndexesCell.end());
-				if(m_nCol2 - m_nCol1 + 1 == aIndexesCell.size() && m_nCol1 == aIndexesCell[0] && m_nCol2 == aIndexesCell[aIndexesCell.size() - 1])
+
+                std::sort(aIndexesCell.begin(), aIndexesCell.end());
+
+                if(m_nCol2 - m_nCol1 + 1 == aIndexesCell.size() && m_nCol1 == aIndexesCell[0] && m_nCol2 == aIndexesCell[aIndexesCell.size() - 1])
 				{
 					for(size_t j = 0; j < aIndexesCell.size(); ++j)
 					{
@@ -482,13 +503,14 @@ namespace BinXlsxRW{
 			}
 		}
 	}
-	OOX::Spreadsheet::CWorksheet* ChartWriter::toXlsxGetSheet(std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName)
+	OOX::Spreadsheet::CWorksheet* ChartWriter::toXlsxGetSheet(std::vector<OOX::Spreadsheet::CWorksheet*>& arWorksheets, std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName)
 	{
 		OOX::Spreadsheet::CWorksheet* pWorksheet = NULL;
-		std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>::const_iterator it = mapWorksheets.find(sName);
-		if (it == mapWorksheets.end())
+		std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>::const_iterator pFind = mapWorksheets.find(sName);
+
+        if (pFind == mapWorksheets.end())
 		{
-			pWorksheet = new OOX::Spreadsheet::CWorksheet();
+			pWorksheet = new OOX::Spreadsheet::CWorksheet(NULL);
 			pWorksheet->m_oSheetFormatPr.Init();
 			pWorksheet->m_oSheetFormatPr->m_oDefaultRowHeight.Init();
 			pWorksheet->m_oSheetFormatPr->m_oDefaultRowHeight->SetValue(15);
@@ -508,39 +530,48 @@ namespace BinXlsxRW{
 			pWorksheet->m_oPageMargins->m_oFooter->FromInches(0.3);
 
 			mapWorksheets[sName] = pWorksheet;
+			arWorksheets.push_back(pWorksheet);
 		}
 		else
 		{
-			pWorksheet = it->second;
+			pWorksheet = pFind->second;
 		}
 		return pWorksheet;
 	}
-	void ChartWriter::toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>& rows, std::vector<std::wstring>& aSharedStrings)
+    void ChartWriter::toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>& rows, std::vector<std::wstring>& aSharedStrings)
 	{
 		pWorksheet->m_oSheetData.Init();
 		std::vector<int> aIndexesRow;
-		for(std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::const_iterator it = rows.begin(); it != rows.end(); it++)
+
+        for(std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::const_iterator it = rows.begin(); it != rows.end(); ++it)
 		{
 			aIndexesRow.push_back(it->first);
 		}
-		std::sort(aIndexesRow.begin(), aIndexesRow.end());
-		for(size_t i = 0; i < aIndexesRow.size(); ++i)
+
+        std::sort(aIndexesRow.begin(), aIndexesRow.end());
+
+        for(size_t i = 0; i < aIndexesRow.size(); ++i)
 		{
 			int nIndexRow = aIndexesRow[i];
-			OOX::Spreadsheet::CRow* pRow = new OOX::Spreadsheet::CRow();
+
+            OOX::Spreadsheet::CRow* pRow = new OOX::Spreadsheet::CRow();
 			pRow->m_oR.Init();
 			pRow->m_oR->SetValue(nIndexRow);
-			const std::map<int, OOX::Spreadsheet::CCell*>& cells = *rows.at(nIndexRow);
+
+            const std::map<int, OOX::Spreadsheet::CCell*>& cells = *rows.at(nIndexRow);
 			std::vector<int> aIndexesCell;
-			for(std::map<int, OOX::Spreadsheet::CCell*>::const_iterator it = cells.begin(); it != cells.end(); it++)
+
+            for(std::map<int, OOX::Spreadsheet::CCell*>::const_iterator it = cells.begin(); it != cells.end(); ++it)
 			{
 				aIndexesCell.push_back(it->first);
 			}
 			std::sort(aIndexesCell.begin(), aIndexesCell.end());
-			for(size_t j = 0; j < aIndexesCell.size(); ++j)
+
+            for(size_t j = 0; j < aIndexesCell.size(); ++j)
 			{
 				int nIndexCell = aIndexesCell[j];
-				OOX::Spreadsheet::CCell* pCell = cells.at(nIndexCell);
+
+                OOX::Spreadsheet::CCell* pCell = cells.at(nIndexCell);
 				//SharedStrings
 				if(pCell->m_oValue.IsInit())
 				{
@@ -588,22 +619,24 @@ namespace BinXlsxRW{
 	}
 	void ChartWriter::parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format = NULL)
 	{
-		std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::const_iterator itSheets = m_mapSheets.find(sheet);
-		std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = NULL;
-		if(itSheets == m_mapSheets.end())
+        std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::const_iterator itSheets = m_mapSheets.find(sheet);
+        std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = NULL;
+
+        if(itSheets == m_mapSheets.end())
 		{
-			rows = new std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>();
+            rows = new std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>();
 			m_mapSheets.insert(std::make_pair(sheet, rows));
 		}
 		else
 		{
 			rows = itSheets->second;
 		}
-		std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::const_iterator itRows = rows->find(nRow);
-		std::map<int, OOX::Spreadsheet::CCell*>* cells = NULL;
-		if(itRows == rows->end())
+        std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::const_iterator itRows = rows->find(nRow);
+        std::map<int, OOX::Spreadsheet::CCell*>* cells = NULL;
+
+        if(itRows == rows->end())
 		{
-			cells = new std::map<int, OOX::Spreadsheet::CCell*>();
+            cells = new std::map<int, OOX::Spreadsheet::CCell*>();
 			rows->insert(std::make_pair(nRow, cells));
 		}
 		else
@@ -622,10 +655,12 @@ namespace BinXlsxRW{
 		//пока добавляем как есть, shared string после записи таблицы
 		pNewCell->m_oValue.Init();
 		pNewCell->m_oValue->m_sText = val;
-		if(NULL != format)
+
+        if(NULL != format)
 		{
 			int nXfsIndex = m_aXfs.size();
-			std::map<std::wstring, int>::const_iterator itFormat = m_mapFormats.find(*format);
+
+            boost::unordered_map<std::wstring, int>::const_iterator itFormat = m_mapFormats.find(*format);
 			if(itFormat == m_mapFormats.end())
 			{
 				m_mapFormats[*format] = nXfsIndex;
@@ -658,8 +693,7 @@ namespace BinXlsxRW{
 			std::wstring wb, sheetFrom, sheetTo;
 			int nRow1, nCol1, nRow2, nCol2;
 			if(OOX::Spreadsheet::CCell::parse3DRef(*pStrRef->m_f, wb, sheetFrom, sheetTo, nRow1, nCol1, nRow2, nCol2) &&
-					sheetFrom.length() > 0 && 0 == wb.length() && 0 == sheetTo.length() &&
-					NULL != pStrRef->m_strCache)
+					sheetFrom.length() > 0 && 0 == sheetTo.length() && NULL != pStrRef->m_strCache)
 			{
 				bool bRow = nRow1 == nRow2;
 				if(bUpdateRange)
@@ -727,7 +761,7 @@ namespace BinXlsxRW{
 			std::wstring wb, sheetFrom, sheetTo;
 			int nRow1, nCol1, nRow2, nCol2;
 			if(OOX::Spreadsheet::CCell::parse3DRef(*pNumRef->m_f, wb, sheetFrom, sheetTo, nRow1, nCol1, nRow2, nCol2) &&
-				sheetFrom.length() > 0 && 0 == wb.length() && 0 == sheetTo.length() && NULL != pNumRef->m_numCache)
+					sheetFrom.length() > 0 && 0 == sheetTo.length() && NULL != pNumRef->m_numCache)
 			{
 				bool bRow = nRow1 == nRow2;
 				if(bUpdateRange)

ASCOfficeDocxFile2/DocWrapper/ChartWriter.h

@@ -33,8 +33,9 @@
 #define CHART_WRITER
 
 #include <string>
-#include <map>
 #include <vector>
+#include <map>
+#include <boost/unordered_map.hpp>
 
 namespace OOX
 {
@@ -59,22 +60,26 @@ namespace BinXlsxRW {
 	class ChartWriter
 	{
 	public:
-		std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*> m_mapSheets;
-		std::map<std::wstring, int> m_mapFormats;
-		std::vector<OOX::Spreadsheet::CXfs*> m_aXfs;
-		std::vector<std::wstring> m_aTableNames;
-		int m_nRow1;
+        std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>  m_mapSheets;
+        boost::unordered_map<std::wstring, int>                                           m_mapFormats;
+
+        std::vector<OOX::Spreadsheet::CXfs*>    m_aXfs;
+        std::vector<std::wstring>               m_aTableNames;
+
+        int m_nRow1;
 		int m_nCol1;
 		int m_nRow2;
 		int m_nCol2;
-	public:
-		ChartWriter();
+
+        ChartWriter();
 		~ChartWriter();
 		void toXlsx(OOX::Spreadsheet::CXlsx& oXlsx);
 		void parseChart(const OOX::Spreadsheet::CT_Chart* pChart);
-	private:
-		OOX::Spreadsheet::CWorksheet* toXlsxGetSheet(std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName);
+
+    private:
+		OOX::Spreadsheet::CWorksheet* toXlsxGetSheet(std::vector<OOX::Spreadsheet::CWorksheet*>& arWorksheets, std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName);
 		void toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>& rows, std::vector<std::wstring>& aSharedStrings);
+		
 		void parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format);
 		OOX::Spreadsheet::CCell* parseCreateCell(const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format);
 		void parseStrRef(const OOX::Spreadsheet::CT_StrRef* pStrRef, bool bUpdateRange, const wchar_t* cRangeName);

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -39,6 +39,9 @@
 #include "../../ASCOfficePPTXFile/Editor/FontPicker.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
+#include "../../Common/DocxFormat/Source/DocxFormat/App.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Core.h"
+
 int BinDocxRW::g_nCurFormatVersion = 0;
 
 BinDocxRW::CDocxSerializer::CDocxSerializer()
@@ -47,6 +50,7 @@ BinDocxRW::CDocxSerializer::CDocxSerializer()
 	m_pCurFileWriter	= NULL;
 
 	m_bIsNoBase64Save	= false;
+	m_bIsNoBase64		= false;
 	m_bSaveChartAsImg	= false;
 }
 BinDocxRW::CDocxSerializer::~CDocxSerializer()
@@ -54,52 +58,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);
@@ -138,19 +96,25 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, co
 	oDrawingConverter.SetFontDir(m_sFontDir);
 	oDrawingConverter.SetFontPicker(pFontPicker);
 	oDrawingConverter.SetMainDocument(this);
+
+    oDrawingConverter.SetDstPath(pathMain.GetDirectory() + FILE_SEPARATOR_STR + L"word");
 	oDrawingConverter.SetMediaDstPath(pathMedia.GetPath());
 	
 	m_pParamsWriter = new ParamsWriter(&oBufferedStream, &fp, &oDrawingConverter, pEmbeddedFontsManager);
 
 	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 +130,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,28 +232,45 @@ 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.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"word");
+
 				oDrawingConverter.SetMediaDstPath(sMediaPath);
 				oDrawingConverter.SetEmbedDstPath(sEmbedPath);
 				
@@ -299,7 +280,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
                 std::wstring sFileInDir = strFileInDir.c_str();
 
-                oDrawingConverter.SetSourceFileDir(sFileInDir);
+                oDrawingConverter.SetSrcPath(sFileInDir);
 				
 				BinaryFileReader oBinaryFileReader(sFileInDir, oBufferedStream, *m_pCurFileWriter);
 				oBinaryFileReader.ReadFile();
@@ -314,11 +295,13 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				
                 OOX::CPath DocProps = std::wstring(_T("docProps"));
 
-				OOX::CApp* pApp = new OOX::CApp();
+				OOX::CApp* pApp = new OOX::CApp(NULL);
 				if (pApp)
 				{
-					pApp->SetApplication(_T("OnlyOffice"));
-					pApp->SetAppVersion(_T("4.3000"));
+					pApp->SetApplication(L"ONLYOFFICE");
+#if defined(INTVER)
+                    pApp->SetAppVersion(VALUE2STR(INTVER));
+#endif
 					pApp->SetDocSecurity(0);
 					pApp->SetScaleCrop(false);
 					pApp->SetLinksUpToDate(false);
@@ -328,7 +311,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 					pApp->write(pathDocProps + FILE_SEPARATOR_STR + _T("app.xml"), DocProps, *pContentTypes);
 					delete pApp;
 				}				
-				OOX::CCore* pCore = new OOX::CCore();
+				OOX::CCore* pCore = new OOX::CCore(NULL);
 				if (pCore)
 				{
 					pCore->SetCreator(_T(""));
@@ -343,6 +326,11 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				bResultOk = true;
 
 			}
+			if (!bIsNoBase64)
+			{
+				RELEASEARRAYOBJECTS(pData);
+			}
+
 		}
 		RELEASEARRAYOBJECTS(pBase64Data);
 	}
@@ -472,6 +460,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/FontProcessor.cpp

@@ -33,6 +33,12 @@
 
 #include "../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/Docx.h"
+
+#include "../../Common/DocxFormat/Source/DocxFormat/FontTable.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/Styles/TableStyles.h"
+
+#include "../../ASCOfficePPTXFile/PPTXFormat/Theme.h"
+
 #include "../../Common/ASCUtils.h"
 
 namespace DocWrapper {

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -42,6 +42,7 @@
 #include "ChartWriter.h"
 
 #include "../BinReader/DefaultThemeWriter.h"
+//#include "../../Common/DocxFormat/Source/XlsxFormat/Chart/Chart.h"
 
 namespace BinXlsxRW{
 	int g_nCurFormatVersion = 0;
@@ -49,6 +50,7 @@ namespace BinXlsxRW{
 	CXlsxSerializer::CXlsxSerializer()
 	{
 		m_pExternalDrawingConverter = NULL;
+		m_bIsNoBase64 = false;
 	}
 	CXlsxSerializer::~CXlsxSerializer()
 	{
@@ -85,15 +87,16 @@ namespace BinXlsxRW{
 	}
     bool CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir)
 	{
+        std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
+
 		NSBinPptxRW::CDrawingConverter oDrawingConverter;
 		
+        oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"xl");
+        oDrawingConverter.SetSrcPath(strFileInDir, 2);
+
 		oDrawingConverter.SetMediaDstPath(sMediaDir);
 		oDrawingConverter.SetEmbedDstPath(sEmbedDir);
 
-		std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
-
-        oDrawingConverter.SetSourceFileDir(strFileInDir, 2);
-
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;
 		oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions);
 		return true;
@@ -134,7 +137,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;
@@ -166,7 +169,7 @@ namespace BinXlsxRW{
 
 	//todo theme path
 		BinXlsxRW::SaveParams			oSaveParams(sThemePath, m_pExternalDrawingConverter->GetContentTypes());
-		OOX::Spreadsheet::CChartSpace	oChartSpace;
+		OOX::Spreadsheet::CChartSpace	oChartSpace(NULL);
 		BinXlsxRW::BinaryChartReader	oBinaryChartReader(*pReader, oSaveParams, m_pExternalDrawingConverter);
 		
 		oBinaryChartReader.ReadCT_ChartSpace(lLength, &oChartSpace.m_oChartSpace);
@@ -179,20 +182,22 @@ namespace BinXlsxRW{
 				std::wstring sXlsxFilename = L"Microsoft_Excel_Worksheet" + std::to_wstring(lChartNumber) + L".xlsx";
 				std::wstring sXlsxPath = sEmbedingPath + FILE_SEPARATOR_STR + sXlsxFilename;
 				
-				writeChartXlsx(sXlsxPath, oChartSpace);
-				pReader->m_pRels->m_pManager->m_pContentTypes->AddDefault(L"xlsx");
+				if (writeChartXlsx(sXlsxPath, oChartSpace))
+				{
+					pReader->m_pRels->m_pManager->m_pContentTypes->AddDefault(L"xlsx");
 
-				std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
-				long rId;
-                std::wstring bstrChartsWorksheetRelType = OOX::FileTypes::MicrosoftOfficeExcelWorksheet.RelationType();
-                m_pExternalDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &rId);
+					std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
+					long rId;
+					std::wstring bstrChartsWorksheetRelType = OOX::FileTypes::MicrosoftOfficeExcelWorksheet.RelationType();
+					m_pExternalDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &rId);
 
-				oChartSpace.m_oChartSpace.m_externalData = new OOX::Spreadsheet::CT_ExternalData();
-				oChartSpace.m_oChartSpace.m_externalData->m_id = new std::wstring();
-				oChartSpace.m_oChartSpace.m_externalData->m_id->append(L"rId");
-				oChartSpace.m_oChartSpace.m_externalData->m_id->append(std::to_wstring(rId));
-				oChartSpace.m_oChartSpace.m_externalData->m_autoUpdate = new OOX::Spreadsheet::CT_Boolean();
-				oChartSpace.m_oChartSpace.m_externalData->m_autoUpdate->m_val = new bool(false);
+					oChartSpace.m_oChartSpace.m_externalData = new OOX::Spreadsheet::CT_ExternalData();
+					oChartSpace.m_oChartSpace.m_externalData->m_id = new std::wstring();
+					oChartSpace.m_oChartSpace.m_externalData->m_id->append(L"rId");
+					oChartSpace.m_oChartSpace.m_externalData->m_id->append(std::to_wstring(rId));
+					oChartSpace.m_oChartSpace.m_externalData->m_autoUpdate = new OOX::Spreadsheet::CT_Boolean();
+					oChartSpace.m_oChartSpace.m_externalData->m_autoUpdate->m_val = new bool(false);
+				}
 			}
 
 			std::wstring strFilepath	= sFilepath;
@@ -226,7 +231,12 @@ namespace BinXlsxRW{
 	{
 		m_pExternalDrawingConverter = pDrawingConverter;
 	}
-	void CXlsxSerializer::writeChartXlsx(const std::wstring& sDstFile, const OOX::Spreadsheet::CChartSpace& oChart)
+	void CXlsxSerializer::setIsNoBase64(bool bIsNoBase64)
+	{
+		m_bIsNoBase64 = bIsNoBase64;
+	}
+
+	bool CXlsxSerializer::writeChartXlsx(const std::wstring& sDstFile, const OOX::Spreadsheet::CChartSpace& oChart)
 	{
 	//анализируем chart
 		BinXlsxRW::ChartWriter helper;
@@ -245,11 +255,15 @@ namespace BinXlsxRW{
 		helper.toXlsx(oXlsx);
 	//write
 		OOX::CContentTypes oContentTypes;
-		oXlsx.Write(oPath, oContentTypes);
-		//zip
-		COfficeUtils oOfficeUtils(NULL);
-		oOfficeUtils.CompressFileOrDirectory(sTempDir, sDstFile, true);
+		bool res = oXlsx.Write(oPath, oContentTypes);
+		if (res)
+		{
+			//zip
+			COfficeUtils oOfficeUtils(NULL);
+			oOfficeUtils.CompressFileOrDirectory(sTempDir, sDstFile, true);
+		}
 	//clean
 		NSDirectory::DeleteDirectory(sTempDir);
+		return res;
 	}
 };

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,8 +70,9 @@ 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);
+		bool writeChartXlsx     (const std::wstring& sDstFile ,const OOX::Spreadsheet::CChartSpace& oChart);
 	};
 }
 #endif	// #ifndef XLSX_SERIALIZER

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj

@@ -49,8 +49,8 @@
 		6967917D1D9E8AEE002CA4BA /* BinReaderWriterDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */; };
 		6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */; };
 		6967917F1D9E8AEE002CA4BA /* BinWriters.h in Headers */ = {isa = PBXBuildFile; fileRef = 6967917B1D9E8AEE002CA4BA /* BinWriters.h */; };
+		69BBDF251F0B8AAC00EB1BF7 /* FileDownloader_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */; };
 		69F181AF1C77274E00B2952B /* FileDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F181AD1C77274E00B2952B /* FileDownloader.h */; };
-		69F181B51C77276D00B2952B /* FileDownloader_curl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -97,8 +97,8 @@
 		696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinReaderWriterDefines.h; path = ../../BinWriter/BinReaderWriterDefines.h; sourceTree = "<group>"; };
 		6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BinWriters.cpp; path = ../../BinWriter/BinWriters.cpp; sourceTree = "<group>"; };
 		6967917B1D9E8AEE002CA4BA /* BinWriters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinWriters.h; path = ../../BinWriter/BinWriters.h; sourceTree = "<group>"; };
+		69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = FileDownloader_mac.mm; path = ../../../Common/FileDownloader/FileDownloader_mac.mm; sourceTree = "<group>"; };
 		69F181AD1C77274E00B2952B /* FileDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownloader.h; path = ../../../Common/FileDownloader/FileDownloader.h; sourceTree = "<group>"; };
-		69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDownloader_curl.cpp; path = ../../../Common/FileDownloader/FileDownloader_curl.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -230,7 +230,7 @@
 			isa = PBXGroup;
 			children = (
 				69F181AD1C77274E00B2952B /* FileDownloader.h */,
-				69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */,
+				69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */,
 			);
 			name = Common;
 			sourceTree = "<group>";
@@ -314,7 +314,7 @@
 		17E17ED41AC453F800BEA2EA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Ascensio System SIA";
 			};
 			buildConfigurationList = 17E17ED71AC453F800BEA2EA /* Build configuration list for PBXProject "ASCOfficeDocxFile2Lib" */;
@@ -339,7 +339,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				69F181B51C77276D00B2952B /* FileDownloader_curl.cpp in Sources */,
 				17C1FE961ACC42C4006B99B3 /* Common.cpp in Sources */,
 				17C1FE971ACC42C4006B99B3 /* ChartFromToBinary.cpp in Sources */,
 				17C1FE981ACC42C4006B99B3 /* CSVReader.cpp in Sources */,
@@ -348,6 +347,7 @@
 				17C1FE9B1ACC42C4006B99B3 /* CSVWriter.cpp in Sources */,
 				69414A301CB51666003E771B /* ChartWriter.cpp in Sources */,
 				6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */,
+				69BBDF251F0B8AAC00EB1BF7 /* FileDownloader_mac.mm in Sources */,
 				17C1FE9C1ACC42C4006B99B3 /* XlsxSerializer.cpp in Sources */,
 				690FE0851E9BBD68004B26D0 /* Readers.cpp in Sources */,
 				17C1FE9D1ACC42C4006B99B3 /* FontProcessor.cpp in Sources */,
@@ -379,6 +379,7 @@
 					unix,
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
+					_XCODE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
@@ -401,6 +402,7 @@
 				EXECUTABLE_PREFIX = lib;
 				GCC_ENABLE_CPP_EXCEPTIONS = YES;
 				GCC_ENABLE_CPP_RTTI = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					UNICODE,
 					_UNICODE,
@@ -416,6 +418,7 @@
 					unix,
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
+					_XCODE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
@@ -439,13 +442,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
@@ -453,6 +464,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -465,7 +477,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -481,13 +493,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
@@ -495,13 +515,14 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.cpp

@@ -34,9 +34,11 @@
 #include <stdio.h>
 #include <tchar.h>
 
+#include "../../Common/OfficeFileFormatChecker.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 #include "../../DesktopEditor/common/Directory.h"
 #include "../src/ConvertOO2OOX.h"
+#include "../include/logging.h"
 
 
 #if defined(_WIN64)
@@ -45,30 +47,55 @@
 	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
 #endif
 
-
-
-int _tmain(int argc, _TCHAR* argv[])
+HRESULT convert_single(std::wstring srcFileName)
 {
-	if (argc < 2) return 1;
-	
 	HRESULT hr = S_OK;
-//////////////////////////////////////////////////////////////////////////
-	std::wstring srcFileName	= argv[1];
-	std::wstring dstPath		= argc > 2 ? argv[2] : srcFileName + L"-my.docx"; //xlsx pptx docx
+
+	COfficeFileFormatChecker fileChecker(srcFileName);
+
+	std::wstring dstPath = srcFileName;// + ; //xlsx pptx docx
+	switch(fileChecker.nFileType)
+	{
+	case AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT:
+	case AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT_FLAT:		dstPath += L"-my.docx"; break;
+	
+	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS:
+	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS_FLAT:	dstPath += L"-my.xlsx"; break;
+	
+	case AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP:
+	case AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP_FLAT:	dstPath += L"-my.pptx"; break;
+
+	default:
+		return S_FALSE;
+	}
+//---------------------------------------------------------------------------------------------------
+	COfficeUtils oCOfficeUtils(NULL);
 	
 	std::wstring outputDir		= NSDirectory::GetFolderPath(dstPath);
-	
-	std::wstring srcTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
 	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
+	std::wstring srcTempPath;
 
-    // распаковываем исходник во временную директорию
-	COfficeUtils oCOfficeUtils(NULL);
-    if (S_OK != oCOfficeUtils.ExtractToDirectory(srcFileName.c_str(), srcTempPath.c_str(), NULL, 0))
-		return S_FALSE;
+	if (fileChecker.nFileType == AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT		||
+		fileChecker.nFileType == AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS	||
+		fileChecker.nFileType == AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP)
+	{		
+		srcTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
 
+		if (S_OK != oCOfficeUtils.ExtractToDirectory(srcFileName.c_str(), srcTempPath.c_str(), NULL, 0))
+			return S_FALSE;
+	}
+	else // flat
+	{
+		srcTempPath = srcFileName;
+	}
+    _CP_LOG << L"[info] " << srcFileName << std::endl;
+	
 	hr = ConvertOO2OOX(srcTempPath, dstTempPath, L"C:\\Windows\\Fonts", false, NULL);
 
-	NSDirectory::DeleteDirectory(srcTempPath);
+	if (srcTempPath != srcFileName)
+	{
+		NSDirectory::DeleteDirectory(srcTempPath);
+	}
 
 	if (hr != S_OK)  return hr;
    
@@ -77,6 +104,35 @@ int _tmain(int argc, _TCHAR* argv[])
 	
 	NSDirectory::DeleteDirectory(dstTempPath);
 
-////////////////////////////////////////////////////////////////////////
-	return 0;
+	return hr;
 }
+
+HRESULT convert_directory(std::wstring pathName)
+{
+	HRESULT hr = S_OK;
+
+	std::vector<std::wstring> arFiles = NSDirectory::GetFiles(pathName, false);
+
+	for (size_t i = 0; i < arFiles.size(); i++)
+	{
+		convert_single(arFiles[i]);
+	}
+	return S_OK;
+}
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+	if (argc < 2) return 1;
+
+	HRESULT hr = -1;
+	if (NSFile::CFileBinary::Exists(argv[1]))
+	{	
+		hr = convert_single(argv[1]);
+	}
+	else if (NSDirectory::Exists(argv[1]))
+	{
+		hr = convert_directory(argv[1]);
+	}
+
+	return hr;
+}

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcproj

@@ -43,10 +43,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="../../DesktopEditor/xml/build/vs2005;../../DesktopEditor/xml/libxml2/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -67,6 +68,7 @@
 				ShowProgress="0"
 				Version=""
 				LinkIncremental="2"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -335,6 +337,14 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\Common\OfficeFileFormatChecker.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Common\OfficeFileFormatChecker2.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\Common\3dParty\pole\pole.cpp"
 				>
@@ -347,6 +357,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\Common\DocxFormat\Source\Base\unicode_util.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
 				>

ASCOfficeOdfFile/formulasconvert/formulasconvert.h

@@ -32,6 +32,7 @@
 #pragma once
 
 #include <string>
+#include <vector>
 #include "../include/cpdoccore/CPScopedPtr.h"
 
 namespace cpdoccore {
@@ -51,12 +52,15 @@ 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);
 	
 	//Sheet2.C3:Sheet2.C19 -> Sheet2!C3:C19
     std::wstring convert_chart_distance(std::wstring const & expr);
+
+	void split_distance_by(const std::wstring& expr, const std::wstring& by, std::vector<std::wstring>& out);
     
     std::wstring convert_ref(std::wstring const & expr);
 
@@ -87,9 +91,10 @@ public:
 	std::wstring convert_conditional_formula(std::wstring const & expr);
   
     // Лист1!$A$1 -> $Лист1.$A$1 
-    std::wstring convert_named_ref(std::wstring const & expr);
+    std::wstring convert_named_ref	(std::wstring const & expr);
+	std::wstring convert_named_formula(std::wstring const & expr);
 
-	std::wstring find_base_cell(std::wstring const & expr);
+	std::wstring get_table_name();
 
 	//Sheet2!C3:C19 -> Sheet2.C3:Sheet2.C19 
     std::wstring convert_chart_distance(std::wstring const & expr);

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -32,7 +32,6 @@
 #include "formulasconvert.h"
 
 #include <boost/regex.hpp>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include"../../Common/DocxFormat/Source/XML/Utils.h"
@@ -43,10 +42,12 @@ 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);
+
+		void split_distance_by(const std::wstring& expr, const std::wstring& by, std::vector<std::wstring>& out);
+		
 		void replace_cells_range(std::wstring& expr, bool withTableName);
 		bool check_formula(std::wstring& expr);
 		void replace_semicolons(std::wstring& expr);
@@ -57,11 +58,16 @@ namespace formulasconvert {
 		static std::wstring replace_named_ref_formater1(boost::wsmatch const & what);
 		static std::wstring replace_cell_range_formater(boost::wsmatch const & what);
 		
+		void replace_named_formula(std::wstring & expr, bool w = true);
 		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)
 	{	
@@ -151,11 +157,20 @@ 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(); 
 
 			if (convert_with_TableName)
 			{
+				if (std::wstring::npos != sheet1.find(L" "))
+				{
+					if (sheet1[0] != L'\'')
+					{
+						sheet1 = L"'" + sheet1 + L"'";
+					}
+				}
 				return (sheet1 + L"!") + c1 + (c2.empty() ? L"" : (L":" + c2) );
 			}
 			else
@@ -172,15 +187,25 @@ 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) );
+				return (sheet1 + L"!") + c1 + (c3.empty() ? L"" : (L":" + c3) );
 			}
 			else
 			{
 				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)
@@ -208,10 +233,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(
@@ -226,8 +251,8 @@ namespace formulasconvert {
 		convert_with_TableName = withTableName;
 		
 		//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}");
-
+		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,
@@ -263,15 +288,12 @@ namespace formulasconvert {
 			return what[2].str();    
 		else if (what[3].matched)
 			return what[3].str();
-		//else if (what[4].matched)
-		//    return what[4].str();
 		else
 			return L"";
 	}
 
 	// TODO
 	// заменить точки с запятой во всех вхождениях кроме находящихся в кавычках --*и в фигурных скобках*--
-	// TODO: проверить как сохраняются кавычки в строке
 	void odf2oox_converter::Impl::replace_semicolons(std::wstring& expr)
 	{
 		 const std::wstring res = boost::regex_replace(
@@ -367,30 +389,37 @@ namespace formulasconvert {
 	}
 
 
-	std::wstring forbidden_formulas[] =
-	{
-		L"NULLFORMULA"
-		/*
-		L"BETADIST",
-		L"CEILING",
-		L"FLOOR",
-		L"RANK",
-		L"ROUND",
-		L"ROUNDDOWN",
-		L"ROUNDUP",
-		L"SUBTOTAL",
-		L"FORMULA",
-		L"ISREF"*/
-	};
+	//std::wstring forbidden_formulas[] =
+	//{
+	//	L"NULLFORMULA"	
+	//	//L"BETADIST",
+	//	//L"CEILING",
+	//	//L"FLOOR",
+	//	//L"RANK",
+	//	//L"ROUND",
+	//	//L"ROUNDDOWN",
+	//	//L"ROUNDUP",
+	//	//L"SUBTOTAL",
+	//	//L"FORMULA",
+	//	//L"ISREF"
+	//};
 
-	bool is_forbidden(const std::wstring & formula)
+	std::wstring is_forbidden(const std::wstring & formula)
 	{
-		BOOST_FOREACH(const std::wstring & s, forbidden_formulas)
+		std::wstring result = formula;
+        std::map<std::wstring, std::wstring> forbidden_formulas;
+
+		forbidden_formulas.insert(std::make_pair(L"FORMULA", L"_xlfn.FORMULATEXT"));
+		
+        for (std::map<std::wstring, std::wstring>::iterator it = forbidden_formulas.begin(); it != forbidden_formulas.end(); ++it)
 		{
-			if (boost::algorithm::contains(formula, s))
-				return true;
+			if (boost::algorithm::contains(formula, it->first))
+			{
+
+				XmlUtils::replace_all(result, it->first, it->second);
+			}
 		}
-		return false;
+		return result;
 	}
 
 	// заменить вертикальную черту во всех вхождениях в фигурных скобках, но не внутри строк
@@ -416,10 +445,7 @@ namespace formulasconvert {
 
 	std::wstring odf2oox_converter::Impl::convert(const std::wstring& expr)
 	{
-		if (is_forbidden(expr))
-			return L"NULLFORMULA()";
-		
-		std::wstring workstr = expr;
+		std::wstring workstr = is_forbidden(expr);
 		//boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// Better_Donut.ods- cell(c27)
 		//std::wstring workstr = boost::regex_replace(
 		//	expr,
@@ -428,7 +454,7 @@ namespace formulasconvert {
 		//	boost::match_default | boost::format_all);	
 
 		bool isFormula = check_formula(workstr);
-		
+
 		boost::regex_replace(
 			workstr,
 			boost::wregex(L"('.*?')|(\".*?\")"),
@@ -451,6 +477,12 @@ namespace formulasconvert {
 			}	
 			//todooo INDEX((A1:C6~A8:C11),2,2,2) - ???? - INDEX_emb.ods
 		}
+		else
+		{
+			size_t sz_workstr = workstr.length();
+            if (workstr.substr(0, (std::min)((size_t)3, sz_workstr)) == L"of:")//sample_02neu_crashes.ods
+				workstr =  workstr.substr(3);
+		}
 
 
 	//-----------------------------------------------------------
@@ -470,16 +502,34 @@ namespace formulasconvert {
 		return workstr;
 	}
 
+	void odf2oox_converter::Impl::split_distance_by(const std::wstring& expr, const std::wstring& by, std::vector<std::wstring>& out)
+	{
+		std::wstring workstr = expr;
+		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
+
+		workstr = boost::regex_replace(
+			expr,
+			complexRef,
+			&replace_point_space,
+			boost::match_default | boost::format_all);
+	    
+		boost::algorithm::split(out, workstr, boost::algorithm::is_any_of(by), boost::algorithm::token_compress_on);
+		
+		for (size_t i = 0; i < out.size(); i++)
+		{
+ 			XmlUtils::replace_all( out[i], L"PROBEL", L" ");
+			XmlUtils::replace_all( out[i], L"TOCHKA", L".");
+		}
+	}
 
 	//Sheet2.C3:Sheet2.C19 Sheet2.L29:Sheet2.L36
 	//в
 	//Sheet2!C3:C19,Sheet2!L27:L34
+
 	std::wstring odf2oox_converter::Impl::convert_chart_distance(const std::wstring& expr)
 	{
-		if (is_forbidden(expr))
-			return L"NULLFORMULA()";
+		std::wstring workstr = is_forbidden(expr);
 
-		std::wstring workstr = expr;
 		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
 
 		workstr = boost::regex_replace(
@@ -495,25 +545,27 @@ namespace formulasconvert {
 
 		boost::algorithm::split(distance_inp, workstr, boost::algorithm::is_any_of(L" "), boost::algorithm::token_compress_on);
 
-		BOOST_FOREACH(std::wstring &d,distance_inp)
+		for (size_t i = 0; i < distance_inp.size(); i++)
 		{
 			std::wstring sheet;
 			std::vector<std::wstring> range;
 			std::vector<std::wstring> cells;
 
-			boost::algorithm::split(range,d, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
+			boost::algorithm::split(range, distance_inp[i], boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
 
-			BOOST_FOREACH(std::wstring &c,range)
+			for (size_t j = 0; j < range.size(); j++)
 			{
-				const std::string::size_type colon = c.find('.');
-				cells.push_back(c.substr(colon+1));
-				if (sheet.size()<1)
-					sheet=c.substr(0, colon);
+				const std::string::size_type colon = range[j].find('.');
+				cells.push_back(range[j].substr(colon + 1));
+				if (sheet.size() < 1)
+				{
+					sheet = range[j].substr(0, colon);
+				}
 			}
 			std::wstring cells_out;
-			BOOST_FOREACH(std::wstring &c,cells)
+			for (size_t j = 0; j < cells.size(); j++)
 			{
-				cells_out.append(c);
+				cells_out.append(cells[j]);
 				cells_out.append(L":");
 			}
 			int res1 = sheet.find(L"-");
@@ -524,19 +576,19 @@ namespace formulasconvert {
 				sheet = L"'" + sheet + L"'";
 			}
 
-			distance_out.push_back(sheet+L"!" + cells_out.substr(0, cells_out.size()-1));
+			distance_out.push_back(sheet + L"!" + cells_out.substr(0, cells_out.size()-1));
 		}
 		std::wstring result;
 
-		BOOST_FOREACH(std::wstring &d, distance_out)
+		for (size_t i = 0; i < distance_out.size(); i++)
 		{
-			result.append(d);
+			result.append(distance_out[i]);
 			result.append(L",");
 		}
  		XmlUtils::replace_all( result, L"PROBEL" , L" ");
-		XmlUtils::replace_all( result, L"TOCHKA"	, L".");
+		XmlUtils::replace_all( result, L"TOCHKA", L".");
 		
-		return result.substr(0, result.size()-1);// минус последняя лишняя запятая
+		return result.substr(0, result.size() - 1);// минус последняя лишняя запятая
 	}
 	odf2oox_converter::odf2oox_converter(): impl_(new odf2oox_converter::Impl)
 	{
@@ -546,6 +598,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);
@@ -554,6 +611,10 @@ namespace formulasconvert {
 	{
 		return impl_->convert_chart_distance(expr);
 	}
+	void odf2oox_converter::split_distance_by(const std::wstring& expr, const std::wstring& by, std::vector<std::wstring>& out)
+	{
+		return impl_->split_distance_by(expr, by, out);
+	}
 	std::wstring odf2oox_converter::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator)
 	{
 		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
@@ -577,34 +638,60 @@ namespace formulasconvert {
 		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
 		XmlUtils::replace_all( workstr, L"APOSTROF"	, L"'");
 		XmlUtils::replace_all( workstr, L"TOCHKA"	, L".");
+
+		if (impl_->table_name_.empty() == false)
+		{
+			XmlUtils::replace_all( impl_->table_name_, L"PROBEL"	, L" ");
+			XmlUtils::replace_all( impl_->table_name_, L"APOSTROF"	, L"'");
+			XmlUtils::replace_all( impl_->table_name_, L"TOCHKA"	, L".");
+		}
 		return workstr;
 	}
 	std::wstring odf2oox_converter::convert_named_expr(const std::wstring& expr, bool withTableName)
 	{
-		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
+		std::wstring workstr = expr;
 
-		std::wstring workstr = boost::regex_replace(
-			expr,
-			complexRef,
-			&replace_point_space,
-			boost::match_default | boost::format_all);	
+		bool isFormula = impl_->check_formula(workstr);
 
-		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);
+		}
+		else
+		{
+
+			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".");
+
+			if (impl_->table_name_.empty() == false)
+			{
+ 				XmlUtils::replace_all( impl_->table_name_, L"PROBEL"	, L" ");
+				XmlUtils::replace_all( impl_->table_name_, L"APOSTROF"	, L"'");
+				XmlUtils::replace_all( impl_->table_name_, L"TOCHKA"	, L".");
+			}
 		}
- 		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

@@ -43,6 +43,7 @@ namespace formulasconvert {
 class oox2odf_converter::Impl
 {
 public:
+
     std::wstring convert(const std::wstring& expr);
 	std::wstring convert_formula(const std::wstring& expr);
 	std::wstring convert_conditional_formula(const std::wstring& expr);
@@ -59,93 +60,17 @@ public:
 	static std::wstring replace_arguments(boost::wsmatch const & what);
 	static std::wstring convert_scobci(boost::wsmatch const & what);
 	
-	std::wstring  replace_arguments1(std::wstring & workstr);
-
     void replace_named_ref(std::wstring & expr);
+    void replace_named_formula(std::wstring & expr);
 	
-	std::wstring find_base_cell(const std::wstring & expr);
+	static bool isFindBaseCell_;
 
- //   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 std::wstring table_name_;
 };
-////Table!.$A$1:$A2 -> ref $A$1 -> ref $A$2
-//bool oox2odf_converter::Impl::find_first_last_ref(std::wstring const & expr, std::wstring & table,std::wstring & ref_first,std::wstring & ref_last)
-//{	
-//	std::vector< std::wstring > splitted;
-//    
-//	boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L".:"), boost::algorithm::token_compress_on);
-//    
-//	if (splitted.size()>2)
-//	{
-//		table	= splitted[0];	
-//		ref_first = splitted[1];
-//		ref_last = splitted[2];
-//		return true;
-//	}
-//	return false;
-//}
-//   // =[.A1]+[.B1] -> table = ""; ref = "A1"
-//    // of:=['Sheet2 A'.B2] -> table= "Sheet2 A"; ref = "B2"
-//
-//bool oox2odf_converter::Impl::find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref)
-//{
-//    boost::wregex re(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.([a-zA-Z\\$]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]");
-//    boost::wsmatch result;
-//    bool b = boost::regex_search(expr, result, re);
-//
-//    size_t sz = result.size();
-//    if (sz == 4 && !result[1].matched)
-//    {
-//        table = L"";
-//        ref =  result[2].str();        
-//        return true;
-//    }
-//    else if (sz == 4 && result[1].matched)
-//    {
-//        table = result[1].str();
-//        XmlUtils::replace_all( table, L"$", L"");
-//        XmlUtils::replace_all( table, L"'", L"");
-//        ref =  result[2].str();                
-//        return true;
-//    }
-//    return false;
-//}
-//
-//namespace 
-//{
-//
-//std::wstring replace_cell_range_formater(boost::wsmatch const & what)
-//{
-//    const size_t sz = what.size();
-//    if (sz == 4 && !what[1].matched)
-//    {
-//        const std::wstring c1 = what[2].str(); 
-//        const std::wstring c2 = what[3].str(); 
-//        const std::wstring s =  c1 + (c2.empty() ? L"" : (L":" + c2) );
-//        return s;
-//    }
-//    else if (sz == 4 && what[1].matched)
-//    {
-//        std::wstring sheet1 = what[1].str();
-//        XmlUtils::replace_all( sheet1, L"$", L"");
-//
-//        const std::wstring c1 = what[2].str(); 
-//        const std::wstring c2 = what[3].str(); 
-//        const std::wstring s =  sheet1 + L"!" + c1 + (c2.empty() ? L"" : (L":" + c2) );
-//        return s;
-//    }
-//    return L"";
-//}
-//
-//}
-//
 
-// заменяем формат адресации ячеек НАОБОРОТ
-// [.A1] -> A1
-// [.A1:.B5] -> A1:B5
-// [Sheet2.A1:B5] -> Sheet2!A1:B5
-// [Sheet2.A1] -> Sheet2!A1
-// [$'Sheet2 A'.$B2] -> 'Sheet2 A'!$B2
+bool			oox2odf_converter::Impl::isFindBaseCell_ = false;
+std::wstring	oox2odf_converter::Impl::table_name_ = L"";
+
 void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr)
 {
 	boost::wregex re(L"([:$!])+");
@@ -155,8 +80,10 @@ void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr)
 
 	if (b)
 	{
-		boost::wregex re1(L"(\\$?\\w+\\!)?([a-zA-Z$]+\\d{1,})\\:?([a-zA-Z$]+\\d{1,})?");
-//                          $   Sheet2   ! $ A1                  :  $ B5    
+		boost::wregex re1(L"(\\$?\\w+\\!)?([a-zA-Z$]*\\d*)\\:?([a-zA-Z$]*\\d*)?");
+//                          $   Sheet2   ! $ A1                 :  $ B5    
+//                          $   Sheet2   ! $ A                  :  $ A    
+//                          $   Sheet2   ! $ 1                  :  $ 1    
 		std::wstring workstr = expr;
 		
 		std::wstring res = boost::regex_replace(
@@ -178,19 +105,28 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater1(boost::wsmat
 {
     const size_t sz = what.size();
 	
-	if (sz>3)
+	if (sz > 3)
     {
-		std::wstring sheet1 = what[1].matched ? what[1].str() : L"";
-        XmlUtils::replace_all( sheet1, L"!", L"");
+		std::wstring s;
+		std::wstring sheet = what[1].matched ? what[1].str() : L"";
 
         std::wstring c1 = what[2].str(); 
         std::wstring c2 = what[3].str(); 
-		int res=0;
-		if (sheet1.length() > 0  && (res = c1.find(L"$")) >=0) sheet1 = L"$"  + sheet1;
+		
+		if (!c1.empty() || !c2.empty() || !sheet.empty())
+		{      
+			XmlUtils::replace_all( sheet, L"!", L"");
 
-		const std::wstring s =  std::wstring(L"[")  + sheet1 + L"." + 
-								c1 +
-								(c2.empty() ? L"" : (L":" + sheet1  + L"." + c2) ) + std::wstring(L"]");
+			if (isFindBaseCell_ && table_name_.empty() && !sheet.empty())
+			{
+				table_name_ = sheet + L".$A$1";
+			}	
+			if (!sheet.empty()  && (std::wstring::npos != c1.find(L"$"))) sheet = L"$"  + sheet;
+
+			s =  std::wstring(L"[")  + sheet + L"." + 
+									 c1 +
+									(c2.empty() ? L"" : (L":" + sheet  + L"." + c2) ) + std::wstring(L"]");
+		}
         return s;
 	}
 	else
@@ -209,7 +145,7 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater2(boost::wsmat
 {
     const size_t sz = what.size();
 	
-	if (sz>2)
+	if (sz > 2)
 	{
         const std::wstring c1 = what[1].str(); 
         const std::wstring c2 = what[2].str(); 
@@ -222,39 +158,22 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater2(boost::wsmat
     return L"";
 
 }
-
-//namespace {
-//
-//std::wstring replace_named_ref_formater(boost::wsmatch const & what)
-//{
-//    const size_t sz = what.size();
-//
-//    if (sz == 4 && !what[1].matched)
-//    {
-//        const std::wstring c1 = what[2].str(); 
-//        const std::wstring c2 = what[3].str(); 
-//        const std::wstring s =  c1 + (c2.empty() ? L"" : (L":" + c2) );
-//        return s;
-//    }
-//    else if (sz == 4 && what[1].matched)
-//    {
-//        std::wstring sheet1 = what[1].str();
-//        XmlUtils::replace_all( sheet1, L"$", L"");
-//
-//        const std::wstring c1 = what[2].str(); 
-//        const std::wstring c2 = what[3].str(); 
-//        const std::wstring s =  sheet1 + L"!" + c1 + (c2.empty() ? L"" : (L":" + c2) );
-//        return s;
-//    }
-//    return L"";
-//}
-//
-//}
+		
+void oox2odf_converter::Impl::replace_named_formula(std::wstring & expr)
+{
+	table_name_.clear();
+	
+	isFindBaseCell_ = true;
+	expr = convert_formula(expr);
+	isFindBaseCell_ = false;
+}
 
   // Лист1!$A$1 -> $Лист1.$A$1 
-
 void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 {
+	table_name_.clear();
+	
+	isFindBaseCell_ = true;
 	std::wstring workstr = expr, out;
    
 	replace_vertical(workstr);
@@ -264,8 +183,10 @@ void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 
 	boost::algorithm::split(distance,workstr, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
 
-	BOOST_FOREACH(std::wstring &d, distance)
+	for (size_t i = 0; i < distance.size(); i++)
 	{		
+		std::wstring &d = distance[i];
+
 		XmlUtils::replace_all( d, L"(", L"SCOBCAIN");
 		XmlUtils::replace_all( d, L")", L"SCOBCAOUT");
 		XmlUtils::replace_all( d, L" ", L"PROBEL");
@@ -283,21 +204,18 @@ void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 		out = out + d + std::wstring(L";");
 	}
 
-	if (out.length()>0) expr = out.substr(0,out.length()-1);
+	if (!out.empty()) expr = out.substr(0, out.length() - 1);
 
-}
+	isFindBaseCell_ = false;
 
-
-std::wstring oox2odf_converter::Impl::find_base_cell(const std::wstring & expr)
-{
-	std::vector< std::wstring > splitted;
-	boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L"!"), boost::algorithm::token_compress_on);
-    
-	if (splitted.size()>1)
+	if (table_name_.empty() == false)
 	{
-		return splitted[0] + L".$A$1";
+		XmlUtils::replace_all( table_name_, L"SCOBCAIN", L"(");
+		XmlUtils::replace_all( table_name_, L"SCOBCAOUT", L")");
+		XmlUtils::replace_all( table_name_, L"PROBEL", L" ");
+		XmlUtils::replace_all( table_name_, L"APOSTROF", L"'");
+		XmlUtils::replace_all( table_name_, L"KAVYCHKA", L"\"");
 	}
-	else return L"";
 }
 
 
@@ -440,32 +358,6 @@ std::wstring replace_(boost::wsmatch const & what)
 
 	return L"";
 }
-std::wstring  oox2odf_converter::Impl::replace_arguments1(std::wstring & workstr1)
-{
-	std::wstring out;
-
-	std::wstring workstr = workstr1;
-		
-	replace_vertical(workstr);
-	replace_semicolons(workstr);		
-	
-	std::vector<std::wstring> distance;
-
-	boost::algorithm::split(distance,workstr, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
-
-	BOOST_FOREACH(std::wstring &d, distance)
-	{		
-	
-		replace_cells_range(d);
-
-		out = out + d + std::wstring(L";");
-	}
-
-	if (out.length()>0) out = out.substr(0,out.length()-1);
-	        
-
-	return out ;
-}
 std::wstring oox2odf_converter::Impl::convert_scobci(boost::wsmatch const & what)
 {
     if (what[1].matched)
@@ -506,33 +398,31 @@ std::wstring  oox2odf_converter::Impl::replace_arguments(boost::wsmatch const &
 
 	int sz = what.size();
 
-	std::wstring c1= what[1].str();
-	std::wstring c2= what[2].str();
-	std::wstring c3= what[3].str();
-
     if (what[1].matched)
     {
-        std::wstring workstr = what[1].str();
-		replace_vertical(workstr);
-		replace_semicolons(workstr);		
-		
+        out = what[1].str();
+	}
+	else if (what[2].matched)
+	{
+        out = what[2].str();
+	}
+    if (!out.empty())
+    {
 		std::vector<std::wstring> distance;
 
-		boost::algorithm::split(distance,workstr, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
+		boost::algorithm::split(distance, out, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
 
-		BOOST_FOREACH(std::wstring &d, distance)
-		{		
-		
-			replace_cells_range(d);
+		out = L"";
+		for (size_t i = 0; i < distance.size(); i++)
+		{				
+			replace_cells_range(distance[i]);
 
-			out = out + d + std::wstring(L";");
+			out = out + distance[i] + std::wstring(L";");
 		}
 
-		if (out.length()>0) out = out.substr(0,out.length()-1);
+		if (!out.empty()) out = out.substr(0, out.length() - 1);
 	
     }    
-    else if (what[2].matched)
-        out = what[2].str();
     else if (what[3].matched)
         out = what[3].str();
 	return out ;
@@ -560,7 +450,7 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 	
 	std::wstring res = boost::regex_replace(
 		res1,
-		boost::wregex(L"(?:(?=[()])(.*?)(?=[)]))"),
+		boost::wregex(L"(?!([a-zA-Z]+\\d*\\())(([a-zA-Z]+\\!)?\\$?[a-zA-Z]*\\$?\\d*(\\:\\$?[a-zA-Z]*\\$?\\d*){0,1})"),
 		&oox2odf_converter::Impl::replace_arguments, boost::match_default | boost::format_all);
 
 	if (res1 == res)
@@ -572,10 +462,6 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 			boost::wregex(L"(\\$?\\w+\\!)?([a-zA-Z$]+\\d{1,})\\:?([a-zA-Z$]+\\d{1,})?"),
 			&replace_cells_range_formater1,
 			boost::match_default | boost::format_all);
-
-		
-		replace_vertical(res);   
-		replace_semicolons(res);
 	}
 
     XmlUtils::replace_all( res, L"SCOBCAIN", L"(");
@@ -584,12 +470,31 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 	XmlUtils::replace_all( res, L"KVADRATIN", L"[");
 	XmlUtils::replace_all( res, L"KVADRATOUT", L"]");
     
-	XmlUtils::replace_all( res, L"PROBEL", L" ");
 
     XmlUtils::replace_all( res, L"APOSTROF", L"'");
 
     XmlUtils::replace_all( res, L"KAVYCHKA", L"\"");
 
+	replace_vertical(res);   
+	replace_semicolons(res);
+
+	XmlUtils::replace_all( res, L"PROBEL", L" ");
+
+	if (table_name_.empty() == false)
+	{
+		XmlUtils::replace_all( table_name_, L"SCOBCAIN", L"(");
+		XmlUtils::replace_all( table_name_, L"SCOBCAOUT", L")");
+
+		XmlUtils::replace_all( table_name_, L"KVADRATIN", L"[");
+		XmlUtils::replace_all( table_name_, L"KVADRATOUT", L"]");
+	    
+
+		XmlUtils::replace_all( table_name_, L"APOSTROF", L"'");
+
+		XmlUtils::replace_all( table_name_, L"KAVYCHKA", L"\"");
+		XmlUtils::replace_all( table_name_, L"PROBEL", L" ");
+	}
+
     return std::wstring(L"of:=") + res;
 
 }
@@ -600,12 +505,12 @@ std::wstring oox2odf_converter::Impl::convert_conditional_formula(const std::wst
 	std::wstring res1 = boost::regex_replace(
         workstr,
 		boost::wregex(L"('.*?')|(\".*?\")"),
-		&oox2odf_converter::Impl::convert_scobci,boost::match_default | boost::format_all);
+		&oox2odf_converter::Impl::convert_scobci, boost::match_default | boost::format_all);
 	
 	std::wstring res = boost::regex_replace(
 		res1,
 		boost::wregex(L"(?:(?=[()])(.*?)(?=[)]))"),
-		&oox2odf_converter::Impl::replace_arguments,boost::match_default | boost::format_all);
+		&oox2odf_converter::Impl::replace_arguments, boost::match_default | boost::format_all);
 
 	if (res1 == res)
 	{
@@ -614,20 +519,21 @@ std::wstring oox2odf_converter::Impl::convert_conditional_formula(const std::wst
 			&replace_cells_range_formater1,
 			boost::match_default | boost::format_all);
 	     
-		replace_vertical(res);
-		replace_semicolons(res);
 	}
 
     XmlUtils::replace_all( res, L"SCOBCAIN", L"(");
     XmlUtils::replace_all( res, L"SCOBCAOUT", L")");
 
-    XmlUtils::replace_all( res, L"PROBEL", L" ");
-
     XmlUtils::replace_all( res, L"APOSTROF", L"'");
 
     XmlUtils::replace_all( res, L"KAVYCHKA", L"\"");
 
-    return res;
+	replace_vertical(res);
+	replace_semicolons(res);
+    
+	XmlUtils::replace_all( res, L"PROBEL", L" ");
+   
+	return res;
 
 }
 //Sheet2!C3:C19,Sheet2!L27:L34
@@ -726,9 +632,15 @@ std::wstring oox2odf_converter::convert_named_ref(const std::wstring& expr)
     impl_->replace_named_ref(workstr);
     return workstr;
 }
-std::wstring oox2odf_converter::find_base_cell(const std::wstring& expr)
+std::wstring oox2odf_converter::convert_named_formula(const std::wstring& expr)
 {
-    return impl_->find_base_cell(expr);
+    std::wstring workstr = expr;
+    impl_->replace_named_formula(workstr);
+    return workstr;
+}
+std::wstring oox2odf_converter::get_table_name()
+{
+    return impl_->table_name_;
 }
 
 
@@ -840,14 +752,6 @@ int oox2odf_converter::get_count_value_points(std::wstring expr)
 	return count;
 }
 
-//bool oox2odf_converter::find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref)
-//{
-//    return impl_->find_first_ref(expr, table, ref);
-//}
-//bool oox2odf_converter::find_first_last_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref_first,std::wstring & ref_last)
-//{
-//    return impl_->find_first_last_ref(expr,  table, ref_first,ref_last);
-//}
 
 }
 }

ASCOfficeOdfFile/include/cpdoccore/odf/odf_document.h

@@ -35,11 +35,15 @@
 #include "../CPSharedPtr.h"
 #include "../CPScopedPtr.h"
 
-
 struct ProgressCallback;
 
 namespace cpdoccore { 
 
+namespace xml
+{
+    class sax;
+}
+
 namespace oox {
 	class docx_conversion_context;
 	class xlsx_conversion_context;
@@ -54,9 +58,10 @@ class odf_document
 {
 public:
     odf_document(const std::wstring & Folder, const ProgressCallback* CallBack);
-    ~odf_document();
+	odf_document(xml::sax * Reader);
+	
+	~odf_document();
 
-public:
     odf_read_context & odf_context();
     
 	bool docx_convert(oox::docx_conversion_context & Context);
@@ -77,6 +82,7 @@ private:
     _CP_SCOPED_PTR(Impl) impl_;
             
 };
+typedef shared_ptr<odf_document>::Type odf_document_ptr;
 
 }
 }

ASCOfficeOdfFile/include/cpdoccore/utf8cpp/utf8/core.h

@@ -335,8 +335,8 @@ namespace internal
     inline bool starts_with_bom (octet_iterator it, octet_iterator end)
     {
         return (
-            ((it != end) && (internal::mask8(*it++)) == bom[0]) &&
-            ((it != end) && (internal::mask8(*it++)) == bom[1]) &&
+            ((it != end) && (internal::mask8(*++it)) == bom[0]) &&
+            ((it != end) && (internal::mask8(*++it)) == bom[1]) &&
             ((it != end) && (internal::mask8(*it))   == bom[2])
            );
     }
@@ -346,8 +346,8 @@ namespace internal
     inline bool is_bom (octet_iterator it)
     {
         return (
-            (internal::mask8(*it++)) == bom[0] &&
-            (internal::mask8(*it++)) == bom[1] &&
+            (internal::mask8(*++it)) == bom[0] &&
+            (internal::mask8(*++it)) == bom[1] &&
             (internal::mask8(*it))   == bom[2]
            );
     }

ASCOfficeOdfFile/include/cpdoccore/utf8cpp/utf8/unchecked.h

@@ -66,7 +66,7 @@ namespace utf8
                 case 1:
                     break;
                 case 2:
-                    it++;
+                    ++it;
                     cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
                     break;
                 case 3:

ASCOfficeOdfFile/include/cpdoccore/xml/attributes.h

@@ -154,7 +154,7 @@ namespace cpdoccore
 			if (val)
 			{
                 std::wstring tmp = *val;
-				XmlUtils::GetLower(tmp);
+				tmp = XmlUtils::GetLower(tmp);
                 return  optional<bool>::Type((tmp == xml_char_value_type::trueVal));
 			}
 			else

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -105,6 +105,7 @@ SOURCES += \
     ../src/odf/table_calculation_settings.cpp \
     ../src/odf/table_docx.cpp \
     ../src/odf/table_named_expressions.cpp \
+    ../src/odf/table_data_pilot_tables.cpp \
     ../src/odf/table_pptx.cpp \
     ../src/odf/table_xlsx.cpp \
     ../src/odf/templates.cpp \
@@ -209,6 +210,14 @@ SOURCES += \
     ../src/odf/datatypes/wrapoption.cpp \
     ../src/odf/datatypes/writingmode.cpp \
     ../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/odf/datatypes/dategroup.cpp \
     ../src/docx/xlsx_conditionalFormatting.cpp \
     ../src/docx/xlsx_dxfs.cpp \
     ../src/docx/docx_content_type.cpp \
@@ -278,6 +287,8 @@ 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_data_validation.cpp \
     ../src/docx/xlsx_utils.cpp \
     ../src/docx/xlsx_xf.cpp
 }
@@ -462,6 +473,8 @@ HEADERS += \
     ../src/odf/datatypes/wrapoption.h \
     ../src/odf/datatypes/writingmode.h \
     ../src/odf/datatypes/xlink.h \
+    ../src/odf/datatypes/chartlabelposition.h \
+    ../src/odf/datatypes/grandtotal.h \
     ../src/docx/docx_content_type.h \
     ../src/docx/docx_conversion_context.h \
     ../src/docx/docx_conversion_state.h \
@@ -539,11 +552,11 @@ HEADERS += \
     ../src/docx/xlsx_table_position.h \
     ../src/docx/xlsx_table_state.h \
     ../src/docx/xlsx_textcontext.h \
+    ../src/docx/xlsx_data_validation.h \
     ../src/docx/xlsx_utils.h \
     ../src/docx/xlsx_xf.h \
     ../include/logging.h \
     ../include/cpdoccore/CPColorUtils.h \
-    ../include/cpdoccore/CPHash.h \
     ../include/cpdoccore/CPNoncopyable.h \
     ../include/cpdoccore/CPOptional.h \
     ../include/cpdoccore/CPScopedPtr.h \

ASCOfficeOdfFile/linux/odffilereaderlib_odf.cpp

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

ASCOfficeOdfFile/linux/odffilereaderlib_odf_datatypes.cpp

@@ -119,3 +119,11 @@
 #include "../src/odf/datatypes/wrapoption.cpp"
 #include "../src/odf/datatypes/writingmode.cpp"
 #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"
+#include "../src/odf/datatypes/dategroup.cpp"

ASCOfficeOdfFile/linux/odffilereaderlib_oox.cpp

@@ -100,3 +100,5 @@
 #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"
+#include "../src/docx/xlsx_data_validation.cpp""

ASCOfficeOdfFile/src/ConvertOO2OOX.cpp

@@ -97,14 +97,6 @@ HRESULT ConvertOO2OOX(const std::wstring & srcPath, const std::wstring & dstPath
 
 		if (encrypted) return AVS_ERROR_DRM;
 
-		//if (type<1)
-		//{
-		//	if (ext == L".odt")type = 1;
-		//	if (ext == L".ods")type = 2;
-		//	if (ext == L".odp")type = 3;
-
-		//}
-
 		if (bOnlyPresentation && type != 3)return AVS_ERROR_UNEXPECTED;
 
 		switch (type)

ASCOfficeOdfFile/src/docx/docx_content_type.cpp

@@ -34,8 +34,6 @@
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
-#include <boost/foreach.hpp>
-
 #include "docx_content_type.h"
 #include "namespaces.h"
 
@@ -86,14 +84,14 @@ std::wostream & content_type_content::xml_to_stream(std::wostream & _Wostream) c
             CP_XML_ATTR(L"xmlns", xmlns::types.value);
 
             
-            BOOST_FOREACH(const xml::element_wc & elm, default_)
+			for (size_t i = 0; i < default_.size(); i++)
             {
-                elm.xml_to_stream(CP_XML_STREAM());
+                default_[i].xml_to_stream(CP_XML_STREAM());
             }
 
-            BOOST_FOREACH(const xml::element_wc & elm, override_)
+		for (size_t i = 0; i < override_.size(); i++)
             {
-                elm.xml_to_stream(CP_XML_STREAM());
+                override_[i].xml_to_stream(CP_XML_STREAM());
             }            
         }
     }

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -96,7 +96,7 @@ void text_tracked_context::start_change (std::wstring id)
 {
 	current_state_.clear();
 
-	current_state_.id	= id;
+	current_state_.id = id;
 }
 void text_tracked_context::end_change ()
 {
@@ -378,7 +378,8 @@ void docx_conversion_context::start_document()
 	output_stream() << L"xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" "; 
 	output_stream() << L"xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" "; 
 	output_stream() << L"xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" "; 
-	output_stream() << L"xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" "; 
+	output_stream() << L"xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" ";
+	output_stream() << L"xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" ";
 	output_stream() << L"mc:Ignorable=\"w14 wp14\">";
 
 
@@ -406,14 +407,12 @@ void docx_conversion_context::end_document()
    
 	output_document_->get_word_files().set_notes(notes_context_);
 ////////////////////////	
-	int count = 0;
-    BOOST_FOREACH(const oox_chart_context_ptr& chart, charts_)
+	for (size_t i = 0; i < charts_.size(); i++)
     {
-		count++;
 		package::chart_content_ptr content = package::chart_content::create();
 
-		chart->serialize(content->content());
-		chart->dump_rels(content->get_rel_file()->get_rels());
+		charts_[i]->serialize(content->content());
+		charts_[i]->dump_rels(content->get_rel_file()->get_rels());
 
 		output_document_->get_word_files().add_charts(content);
 	
@@ -580,10 +579,10 @@ mc:Ignorable=\"w14 wp14\">";
         strm << L"</w:abstractNum>";
     }
 
-    BOOST_FOREACH(int numId, numIds)
+	for (size_t i = 0; i < numIds.size(); i++)
     {
-        strm << L"<w:num w:numId=\"" << numId << L"\" >";
-        strm << L"<w:abstractNumId w:val=\"" << numId << "\" />";
+        strm << L"<w:num w:numId=\"" << numIds[i] << L"\" >";
+        strm << L"<w:abstractNumId w:val=\"" << numIds[i] << "\" />";
         strm << L"</w:num>";    
     }
 
@@ -733,16 +732,38 @@ void docx_conversion_context::start_process_style_content()
     styles_context_.start();
 }
 
-void docx_conversion_context::process_section(std::wostream & strm, odf_reader::style_columns * columns)
+void docx_conversion_context::process_section(std::wostream & strm, odf_reader::style_columns * columns)//from page layout
 {
 	int count_columns = 1;
 	bool sep_columns = false;
 
 	oox::section_context::_section & section = get_section_context().get();
+
+	if (!columns)
+	{
+		if (const odf_reader::style_instance * secStyle = root()->odf_context().styleContainer().style_by_name(section.style_, odf_types::style_family::Section, process_headers_footers_))
+		{
+			if (const odf_reader::style_content * content = secStyle->content())
+			{
+				if (odf_reader::style_section_properties * sectPr = content->get_style_section_properties())
+				{
+					columns = dynamic_cast<odf_reader::style_columns *>( sectPr->style_columns_.get());
+					
+					section.margin_left_	= sectPr->common_horizontal_margin_attlist_.fo_margin_left_;
+					section.margin_right_	= sectPr->common_horizontal_margin_attlist_.fo_margin_right_;		
+				}
+			}
+			if (section.is_dump_)
+			{
+				get_section_context().remove_section();				
+			}
+		}
+	}
 	
+	std::vector<std::pair<double, double>> width_space;
 	if (columns)
 	{
-		if ((columns->fo_column_count_) && (*columns->fo_column_count_ > 1))
+		if (columns->fo_column_count_)
 		{
 			count_columns =  *columns->fo_column_count_;
 		}
@@ -751,44 +772,63 @@ void docx_conversion_context::process_section(std::wostream & strm, odf_reader::
 			if (columns_sep->style_style_ != _T("none"))
 				sep_columns = true;
 		}
-	}
-	if (const odf_reader::style_instance * secStyle = root()->odf_context().styleContainer().style_by_name(section.style_, odf_types::style_family::Section, process_headers_footers_))
-	{
-		if (const odf_reader::style_content * content = secStyle->content())
-		{
-			if (odf_reader::style_section_properties * sectPr = content->get_style_section_properties())
-			{
-				if (odf_reader::style_columns * columns = dynamic_cast<odf_reader::style_columns *>( sectPr->style_columns_.get() ))
-				{
-					if (columns->fo_column_count_)
-					{
-						count_columns =  *columns->fo_column_count_;
-					}
-					if (odf_reader::style_column_sep * columns_sep = dynamic_cast<odf_reader::style_column_sep *>( columns->style_column_sep_.get() ))
-					{
-						if (columns_sep->style_style_ != _T("none"))
-							sep_columns = true;
-					}
-				}
 
-				section.margin_left_	= sectPr->common_horizontal_margin_attlist_.fo_margin_left_;
-				section.margin_right_	= sectPr->common_horizontal_margin_attlist_.fo_margin_right_;
+		if (!columns->style_columns_.empty())
+		{
+			double page_width = 0;
+			const odf_reader::page_layout_instance * pp = root()->odf_context().pageLayoutContainer().page_layout_first();
+			if (pp)
+			{
+				odf_reader::style_page_layout_properties_attlist & attr_page = pp->properties()->attlist_;
+				if (attr_page.fo_page_width_)
+				{
+					page_width = attr_page.fo_page_width_->get_value_unit(odf_types::length::pt);
+				}
+				if (attr_page.common_horizontal_margin_attlist_.fo_margin_left_)
+				{
+					page_width -= attr_page.common_horizontal_margin_attlist_.fo_margin_left_->get_length().get_value_unit(odf_types::length::pt);
+				}
+				if (attr_page.common_horizontal_margin_attlist_.fo_margin_right_)
+				{
+					page_width -= attr_page.common_horizontal_margin_attlist_.fo_margin_right_->get_length().get_value_unit(odf_types::length::pt);
+				}
+			}		
+			for (size_t i = 0; page_width > 0, i < columns->style_columns_.size(); i++)
+			{
+				odf_reader::style_column * col = dynamic_cast<odf_reader::style_column*>( columns->style_columns_[i].get());
+				if (!col) continue;
+
+				double width = page_width * (col->style_rel_width_ ? col->style_rel_width_->get_value() / 65535. : 0);
+
+				double space = col->fo_end_indent_ ? col->fo_end_indent_->get_value_unit(odf_types::length::pt) : 0;
+
+				if (i < columns->style_columns_.size() - 1)
+				{
+					col = dynamic_cast<odf_reader::style_column*>( columns->style_columns_[i + 1].get());
+					space += col->fo_start_indent_ ? col->fo_start_indent_->get_value_unit(odf_types::length::pt) : 0;
+				}
+				
+				width_space.push_back(std::make_pair(width, space));
 			}
 		}
-		if (section.is_dump_)
-		{
-			get_section_context().remove_section();				
-		}
 	}
-
 	CP_XML_WRITER(strm)
 	{
 		CP_XML_NODE(L"w:cols")
 		{
-			CP_XML_ATTR(L"w:equalWidth", L"true");
+			CP_XML_ATTR(L"w:equalWidth", width_space.empty());
 			CP_XML_ATTR(L"w:num", count_columns);
 			CP_XML_ATTR(L"w:sep", sep_columns);
-			CP_XML_ATTR(L"w:space",0);
+			CP_XML_ATTR(L"w:space", 708);
+
+			for (size_t i = 0; i < width_space.size(); i++)
+			{
+				CP_XML_NODE(L"w:col")
+				{
+					CP_XML_ATTR(L"w:w", (int)(width_space[i].first * 20));	
+					CP_XML_ATTR(L"w:space", (int)(width_space[i].second * 20));	
+				}
+			}
 		}
 	}
 }
@@ -801,7 +841,7 @@ bool docx_conversion_context::process_page_properties(std::wostream & strm)
 
 		if (page_layout_instance_) 
 		{
-				page_layout_instance_->docx_convert_serialize(strm, *this);
+				page_layout_instance_->docx_serialize(strm, *this);
 		}
 		else
 		{
@@ -847,18 +887,18 @@ void docx_conversion_context::docx_serialize_paragraph_style(std::wostream & str
    
 	CP_XML_WRITER(strm)
 	{
-		//Tutor_Charlotte_Tutor_the_Entire_World_.odt
-		if (get_section_context().dump_.empty() == false && (!ParentId.empty() || get_section_context().get().is_dump_ || in_header_) 
-			 && !get_table_context().in_table() && !in_drawing)
-		{//две подряд секции или если стиль определен и в заголовки нельзя пихать !!!
-			CP_XML_NODE(L"w:pPr")
-			{
-				CP_XML_STREAM() << get_section_context().dump_;
-				get_section_context().dump_.clear();
-			}
-			finish_paragraph();
-			start_paragraph();
-		}
+		////Tutor_Charlotte_Tutor_the_Entire_World_.odt
+		//if (get_section_context().dump_.empty() == false && (!ParentId.empty() || get_section_context().get().is_dump_ || in_header_) 
+		//	 && !get_table_context().in_table() && !in_drawing)
+		//{//две подряд секции или если стиль определен и в заголовки нельзя пихать !!!
+		//	CP_XML_NODE(L"w:pPr")
+		//	{
+		//		CP_XML_STREAM() << get_section_context().dump_;
+		//		get_section_context().dump_.clear();
+		//	}
+		//	finish_paragraph();
+		//	start_paragraph();
+		//}
 
 		if (!paragraph_style.str().empty() || !ParentId.empty())
 		{		
@@ -1286,7 +1326,8 @@ void docx_conversion_context::start_text_changes (std::wstring id)
 										L" w:author=\""	+ state.author	+ L"\"" ;
 
 		finish_run();
-		state.active = true;
+		state.active		= true;
+		state.in_drawing	= get_drawing_state_content();
 		
 		if (state.type	== 1)
 		{
@@ -1320,7 +1361,7 @@ void docx_conversion_context::start_changes()
 	text_tracked_context_.dumpTcPr_.clear();
 	text_tracked_context_.dumpTblPr_.clear();
 
-	for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); it++)
+	for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); ++it)
 	{
 		text_tracked_context::_state  &state = it->second;
 
@@ -1413,13 +1454,16 @@ void docx_conversion_context::end_changes()
 {
 	if (process_comment_) return;
 
-	for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); it++)
+	for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); ++it)
 	{
 		text_tracked_context::_state  &state = it->second;
 
 		if (state.type	== 0)	continue; //unknown change ... libra format change skip
 		if (state.type	== 3)	continue;
 		if (!state.active)		continue;
+		
+		if (state.in_drawing != get_drawing_state_content())
+			continue;
 
 		if (state.type	== 1)	output_stream() << L"</w:ins>";
 		if (state.type	== 2)	output_stream() << L"</w:del>";

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -224,8 +224,9 @@ public:
 	bool & get_use_image_replace()
 	{
 		bool res = false;
-		if (frames_.size()>0)	return frames_.back().use_image_replace;
-		else					return res;
+		if (!frames_.empty())	return frames_.back().use_image_replace;
+		else
+			throw;
 	}
 
 	std::wstring & get_text_stream_shape()
@@ -492,10 +493,11 @@ public:
 		std::wstring				id;
 		std::wstring				author;
 		std::wstring				date;
-		int							type;
+		int							type = 0;
 		std::wstring				style_name;
 		std::vector<std::wstring>	content;	//delete elements		
-		bool						active;
+		bool						active = false;
+		bool						in_drawing = false;
 	
 		void clear()
 		{
@@ -505,6 +507,7 @@ public:
 			date.clear();
 			content.clear();
 			active = false;
+			in_drawing = false;
 		}
 	};
 	std::wstring dumpPPr_;

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -392,8 +392,11 @@ void docx_serialize_wps(std::wostream & strm, _docx_drawing & val)
 				{
 					CP_XML_NODE(L"wp:extent")
 					{
-						CP_XML_ATTR(L"cx", val.cx);
-						CP_XML_ATTR(L"cy", val.cy);
+						if (val.cx > 0 || val.cy > 0)
+						{
+							CP_XML_ATTR(L"cx", val.cx);
+							CP_XML_ATTR(L"cy", val.cy);
+						}
 
 						serialize_null_extent(CP_XML_STREAM());
 					}
@@ -463,10 +466,13 @@ void docx_serialize_wps(std::wostream & strm, _docx_drawing & val)
 							}
 						}
 					}
-					CP_XML_NODE(L"wp:extent")
+					if (val.cx > 0 || val.cy > 0)
 					{
-						CP_XML_ATTR(L"cx", val.cx); 
-						CP_XML_ATTR(L"cy", val.cy);
+						CP_XML_NODE(L"wp:extent")
+						{
+							CP_XML_ATTR(L"cx", val.cx); 
+							CP_XML_ATTR(L"cy", val.cy);
+						}
 					}
 
 					serialize_wrap(CP_XML_STREAM(), val);

ASCOfficeOdfFile/src/docx/docx_package.cpp

@@ -30,6 +30,7 @@
  *
  */
 
+#include <boost/foreach.hpp>
 
 #include "docx_package.h"
 #include "docx_conversion_context.h"
@@ -218,26 +219,25 @@ void docx_charts_files::write(const std::wstring & RootPath)
 
     size_t count = 0;
 
-    BOOST_FOREACH(const chart_content_ptr & item, charts_)
+	for (int i = 0 ; i < charts_.size(); i++)
     {
-        if (item)
-        {
-            count++;
-            const std::wstring fileName = std::wstring(L"chart") + std::to_wstring(count) + L".xml";
-			const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
-           
-			content_type_content * contentTypes = get_main_document()->get_content_types_file().content();           
-            contentTypes->add_override(std::wstring(L"/word/charts/") + fileName, kWSConType);
+        if (!charts_[i]) continue;
+        
+		count++;
+        const std::wstring fileName = std::wstring(L"chart") + std::to_wstring(count) + L".xml";
+		const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
+       
+		content_type_content * contentTypes = get_main_document()->get_content_types_file().content();           
+        contentTypes->add_override(std::wstring(L"/word/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);
     }
 }
 ///////////////////////////
@@ -319,6 +319,7 @@ namespace
 								xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
 								xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
 								xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
+								xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
 								xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" >";
 
 							//mc:Ignorable=\"w14 wp14\" 

ASCOfficeOdfFile/src/docx/docx_package.h

@@ -33,7 +33,6 @@
 
 #include <string>
 #include <vector>
-#include <boost/foreach.hpp>
 
 #include <cpdoccore/CPSharedPtr.h>
 

ASCOfficeOdfFile/src/docx/docx_table_context.cpp

@@ -32,7 +32,6 @@
 
 #include "docx_conversion_context.h"
 #include "logging.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 #include <cpdoccore/odf/odf_document.h>
 #include "../odf/odfcontext.h"

ASCOfficeOdfFile/src/docx/hyperlinks.cpp

@@ -33,9 +33,6 @@
 #include "hyperlinks.h"
 #include "oox_rels.h"
 
-#include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
-
 #include <cpdoccore/xml/utils.h>
 
 namespace cpdoccore { 

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -181,7 +181,11 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 		sub_path = L"embeddings/";
 	}
 	else 
+	{
 		isMediaInternal = is_internal(href, odf_packet_);
+		if (href.empty() && type == typeImage)
+			return L"";
+	}
 	
 	int number=0;
 	
@@ -205,9 +209,9 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	if ( type == typeChart) outputPath = outputPath + L".xml";
 
 	std::wstring id;
-    for (int i = 0 ; i < items_.size(); i++)
+    for (size_t i = 0 ; i < items_.size(); i++)
     {
-		if (items_[i].href == inputPath)
+		if ((items_[i].href == inputPath && !inputPath.empty()) || (items_[i].type == type && inputPath.empty()))
 		{
 			id			= items_[i].Id;
 			outputPath  = items_[i].outputName;
@@ -235,7 +239,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 				outputPath = outputPath.substr(0, n_svm) + L".png"; 
 			}
 //------------------------------------------------
-			if (inputFileName.empty()) return L"";
+			//if (inputFileName.empty()) return L"";  - Book 27.ods - пустые линки на картинки
 
 			id = std::wstring(L"picId") + std::to_wstring(count_image + 1);
 			count_image++;