.

convert script text in toggle property in simple text

.gitignore

@@ -20,6 +20,7 @@ Common/3dParty/v8/win_32
 Common/3dParty/v8/linux_64
 Common/3dParty/v8/linux_32
 Common/3dParty/v8/mac_64
+Common/3dParty/openssl/openssl
 **/core_build
 **/Release
 **/Debug
@@ -43,3 +44,7 @@ OfficeUtils/win32/OfficeUtilsLib/OfficeUtilsLib/ReadMe.txt
 *.pdb
 *.tlb
 *.idb
+**/.hg
+*.zip
+*.tar.gz
+**/*.build/

.travis.yml

@@ -1 +1,14 @@
-language: cpp
+language: cpp
+compiler: gcc
+dist: trusty
+addons:
+  apt:
+    packages:
+      - p7zip-full
+script:
+  - exit 0
+# Build fails anyway. See explanation in
+# https://github.com/ONLYOFFICE/core/pull/29#issuecomment-306773327
+  - cd Common/3dParty && ./make.sh
+  - cd ../../
+  - make

ASCOfficeDocFile/Common/FormatUtils.h

@@ -58,7 +58,7 @@
 
 #include <boost/format.hpp>
 
-namespace DocFormatUtils
+namespace DocFileFormat
 {
     typedef unsigned char   Bool8;
     typedef unsigned short  Bool16;
@@ -501,7 +501,7 @@ namespace DocFormatUtils
     
 			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 DocFormatUtils
 					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 DocFormatUtils
 					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 DocFormatUtils
 				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]);
 				}
@@ -963,4 +963,3 @@ namespace DocFormatUtils
 	};
 }
 
-using namespace DocFormatUtils;

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/AnnotationReferenceDescriptor.cpp

@@ -76,4 +76,4 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>(newObject);
 	}
-}
+}

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,6 +69,7 @@ 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 WordprocessingMLContentTypes
@@ -157,6 +158,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" );
 
@@ -811,10 +857,10 @@ namespace DocFileFormat
 			{
 				Symbol s = getSymbol( chpx );
 
-                m_pXmlWriter->WriteNodeBegin(L"w:sym", true);
-                m_pXmlWriter->WriteAttribute(L"w:font", FormatUtils::XmlEncode(s.FontName));
-                m_pXmlWriter->WriteAttribute(L"w:char", FormatUtils::XmlEncode(s.HexValue));
-                m_pXmlWriter->WriteNodeEnd(L"", true);
+                //m_pXmlWriter->WriteNodeBegin(L"w:sym", true);
+                //m_pXmlWriter->WriteAttribute(L"w:font", FormatUtils::XmlEncode(s.FontName));
+                //m_pXmlWriter->WriteAttribute(L"w:char", FormatUtils::XmlEncode(s.HexValue));
+                //m_pXmlWriter->WriteNodeEnd(L"", true);
 			}
 			else if ((TextMark::DrawnObject == code) && fSpec)
 			{
@@ -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)
 	{
@@ -1663,12 +1788,17 @@ namespace DocFileFormat
 				FontFamilyName* ffn = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( fontIndex ) );
 
 				ret.FontName = ffn->xszFtn;
-                ret.HexValue = L"f0" + FormatUtils::IntToFormattedWideString( code, L"%02x" );
+                ret.HexValue = L"f0" + FormatUtils::IntToFormattedWideString( code, L"%02x" );//-123 - ShortToFormattedWideString
 
 				break;
 			}		
 		}
 
+		if (ret.HexValue.length() > 4)
+		{
+			ret.HexValue = ret.HexValue.substr(ret.HexValue.length() - 4, 4);
+		}
+
 		return ret;
 	}
 

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/DrawingPrimitives.cpp

@@ -33,7 +33,6 @@
 #include "DrawingPrimitives.h"
 #include "VirtualStreamReader.h"
 
-
 namespace DocFileFormat
 {
 	DrawingPrimitive * DrawingPrimitive::Create(VirtualStreamReader* reader, int length, short dpk)

ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.cpp

@@ -133,14 +133,25 @@ namespace DocFileFormat
 			pos = tStream.GetPosition();
 			
 		//------------------------------------------------------------------------------------------
-			crypt_data_aes.hashAlgorithm = CRYPT_METHOD::SHA1; //by AlgIDHash -> 0x0000 || 0x8004
-			crypt_data_aes.spinCount		= 50000;
+			switch(AlgIDHash)
+			{
+				case 0x8003: crypt_data_aes.hashAlgorithm = CRYPT_METHOD::MD5;	break;
+				case 0x0000: 
+				case 0x8004: crypt_data_aes.hashAlgorithm = CRYPT_METHOD::SHA1;	break;
+			}
+			crypt_data_aes.spinCount = 0;
 
 			switch(AlgID)
 			{
+			case 0x0000:
+				if (fAES)		crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
+				if (fCryptoAPI)	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;	
+				crypt_data_aes.keySize = KeySize / 8;
 			case 0x6801:	
 				crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		
 				crypt_data_aes.keySize = KeySize / 8;
+				
+				if (crypt_data_aes.keySize == 0)	crypt_data_aes.keySize = 5; // 40 bit
 				break;
 			case 0x660E:	
 				crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
@@ -156,16 +167,11 @@ namespace DocFileFormat
 				break;
 			}
 
-			switch(ProviderType)
-			{
-			case 0x0001:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		break;
-			case 0x0018:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB; break;
-			}
-
-
+			//switch(ProviderType)
+			//{
+			//	case 0x0001:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		break;
+			//	case 0x0018:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB; break;
+			//}
 		}
-
-		//RELEASEARRAYOBJECTS( bytes );
 	}
-
 }

ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.h

@@ -50,8 +50,8 @@ namespace DocFileFormat
         
 		EncryptionHeader( FileInformationBlock* fib, POLE::Stream* tableStream );
 	private:    
-		CRYPT::CryptRC4Data					crypt_data_rc4;
-		CRYPT::ECMADecryptor::_cryptData	crypt_data_aes;
-		bool								bStandard;
+		CRYPT::_rc4CryptData	crypt_data_rc4;
+		CRYPT::_ecmaCryptData	crypt_data_aes;
+		bool					bStandard;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/FileInformationBlock.h

@@ -507,9 +507,9 @@ namespace DocFileFormat
 	class FileInformationBlock
 	{
 	public:
-		bool					m_bOlderVersion;
-		int						m_CodePage;
-		FibBase					m_FibBase;
+		bool			m_bOlderVersion;
+		int				m_CodePage;
+		FibBase			m_FibBase;
 		
 		RgW97			m_RgW97;
 		RgLw97			m_RgLw97;
@@ -1189,9 +1189,9 @@ namespace DocFileFormat
 			m_FibBase.fDot				= FormatUtils::BitmaskToBool((int)flag16, 0x0001);
 			m_FibBase.fGlsy				= FormatUtils::BitmaskToBool((int)flag16, 0x0002);
 			m_FibBase.fComplex			= FormatUtils::BitmaskToBool((int)flag16, 0x0002);
-			m_FibBase.fHasPic				= FormatUtils::BitmaskToBool((int)flag16, 0x0008);
-			m_FibBase.cQuickSaves			= (WORD)(((int)flag16 & 0x00F0) >> 4);
-			m_FibBase.fEncrypted			= FormatUtils::BitmaskToBool((int)flag16, 0x0100);
+            m_FibBase.fHasPic			= FormatUtils::BitmaskToBool((int)flag16, 0x0008);
+            m_FibBase.cQuickSaves		= (WORD)(((int)flag16 & 0x00F0) >> 4);
+            m_FibBase.fEncrypted		= FormatUtils::BitmaskToBool((int)flag16, 0x0100);
 			m_FibBase.fWhichTblStm		= FormatUtils::BitmaskToBool((int)flag16, 0x0200);
 			m_FibBase.fReadOnlyRecommended	= FormatUtils::BitmaskToBool((int)flag16, 0x0400);
 			m_FibBase.fWriteReservation	= FormatUtils::BitmaskToBool((int)flag16, 0x0800);

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/MemoryStream.h

@@ -72,7 +72,7 @@ public:
 
 		if (m_Data)
 		{
-			rdUShort	=	FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
+            rdUShort	=	DocFileFormat::FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUShort);
 		}
 
@@ -85,7 +85,7 @@ public:
 
 		if (m_Data)
 		{
-			rdShort		=	FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
+            rdShort		=	DocFileFormat::FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdShort);
 		}
 
@@ -98,7 +98,7 @@ public:
 
 		if (m_Data)
 		{
-			rdInt		=	FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
+            rdInt		=	DocFileFormat::FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdInt);
 		}
 
@@ -111,7 +111,7 @@ public:
 
 		if (m_Data )
 		{
-			rdUInt		=	FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
+            rdUInt		=	DocFileFormat::FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUInt);
 		}
 

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/ChildAnchor.h

@@ -60,7 +60,7 @@ namespace DocFileFormat
 			_size.cx	=	Right - Left;
 			_size.cy	=	Bottom - Top;
 
-			rcgBounds	=	DocFormatUtils::Rectangle (_point, _size);
+			rcgBounds	=	DocFileFormat::Rectangle (_point, _size);
 		}
 
 		virtual ~ChildAnchor()
@@ -75,7 +75,7 @@ namespace DocFileFormat
 	public:
 
 		/// Rectangle that describes the bounds of the anchor
-		DocFormatUtils::Rectangle rcgBounds;
+		DocFileFormat::Rectangle rcgBounds;
 		int Left;
 		int Top;
 		int Right;

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/GroupShapeRecord.h

@@ -64,7 +64,7 @@ namespace DocFileFormat
 			oSize.cx	=	( right - left );
 			oSize.cy	=	( bottom - top );
 
-			rcgBounds	=	DocFormatUtils::Rectangle(oPoint,oSize);
+			rcgBounds	=	DocFileFormat::Rectangle(oPoint,oSize);
 		}
 
 		virtual ~GroupShapeRecord()
@@ -77,6 +77,6 @@ namespace DocFileFormat
 			return new GroupShapeRecord( _reader, bodySize, typeCode, version, instance );
 		}
 
-		DocFormatUtils::Rectangle rcgBounds;
+		DocFileFormat::Rectangle rcgBounds;
 	};
 }

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/OfficeArtFRITContainer.h

@@ -0,0 +1,60 @@
+/*
+ * (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 "RegularContainer.h"
+
+namespace DocFileFormat
+{
+	class OfficeArtFRITContainer: public RegularContainer
+	{
+	public:
+		static const unsigned short TYPE_CODE_0xF118 = 0xF118;
+
+		OfficeArtFRITContainer () : RegularContainer()
+		{
+		}
+
+		OfficeArtFRITContainer (IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance) : RegularContainer (_reader, size, typeCode, version, instance) 
+		{ 
+		}
+
+		virtual ~OfficeArtFRITContainer()
+		{
+		}
+
+		virtual Record* NewObject (IBinaryReader* _reader, unsigned int bodySize, unsigned int typeCode, unsigned int version, unsigned int instance)
+		{
+			return new OfficeArtFRITContainer( _reader, bodySize, typeCode, version, instance );
+		}
+	};
+}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h

@@ -35,68 +35,49 @@
 
 namespace DocFileFormat
 {
+	struct _guides
+	{
+		unsigned char type;
+
+		unsigned char param_type1;
+		unsigned char param_type2;
+		unsigned char param_type3;
+
+		WORD param1;
+		WORD param2;
+		WORD param3;
+	};
 	class PathParser
 	{
 	public:
 
-		PathParser (const unsigned char* pSegmentInfo, unsigned int pSegmentInfoSize, const unsigned char* pVertices, unsigned int pVerticesSize)
+		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))
@@ -105,31 +86,51 @@ namespace DocFileFormat
 				unsigned short nElemsAlloc	=	FormatUtils::BytesToUInt16(pVertices, 2, pVerticesSize);
 				unsigned short cb			=	FormatUtils::BytesToUInt16(pVertices, 4, pVerticesSize);
 
-				if (0xfff0 == cb)
-				{
-					cb	=	4;
+				unsigned short cbElement = cb;
 
-					for (unsigned short i = 0; i < nElems; ++i)
+				if (cb == 0xfff0)
+					cbElement = 4;
+
+				for (unsigned short i = 0; i < nElems; ++i)
+				{				
+					POINT point;	
+					if (cbElement == 4)
 					{
-						POINT point;
-
-						point.x	= FormatUtils::BytesToInt16(pVertices + 6, (i * cb), pVerticesSize);
-						point.y	= FormatUtils::BytesToInt16(pVertices + 6, (i * cb) + (cb / 2), pVerticesSize);
-
-						m_arPoints.push_back(point);
+						point.x	= FormatUtils::BytesToInt16(pVertices + offset, (i * cbElement), pVerticesSize - offset);
+						point.y	= FormatUtils::BytesToInt16(pVertices + offset, (i * cbElement) + (cbElement / 2), pVerticesSize - offset);
 					}
-				}
-				else
-				{
-					for (unsigned short i = 0; i < nElems; ++i)
+					else
 					{
-						POINT point;
-
-						point.x	= FormatUtils::BytesToInt32(pVertices + 6, (i * cb), pVerticesSize);
-						point.y	= FormatUtils::BytesToInt32(pVertices + 6, (i * cb) + (cb / 2), pVerticesSize);
-
-						m_arPoints.push_back(point);
+						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;
+					if (lMinF <= point.x)
+					{
+						int index = (DWORD)point.x - 0x80000000;
+						if (index >= 0 && index < guides.size())
+						{
+							point.x = guides[index].param3;
+						}
+					}
+					if (lMinF <= point.y)
+					{
+						int index = (DWORD)point.y - 0x80000000;
+						if (index >= 0 && index < guides.size())
+						{
+							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);
 				}
 			}
 		}
@@ -163,104 +164,100 @@ namespace DocFileFormat
 			std::vector<PathSegment>::const_iterator end = m_arSegments.end();
 			for (std::vector<PathSegment>::const_iterator iter = m_arSegments.begin(); iter != end; ++iter, cc++)
 			{
-				try
+				switch (iter->Type)
 				{
-					switch (iter->Type)
+				case PathSegment::msopathLineTo:
 					{
-					case PathSegment::msopathLineTo:
+						for (int i = 0; i < iter->Count; ++i)
 						{
-							for (int i = 0; i < iter->Count; ++i)
+							if (valuePointer + 1 > (int)m_arPoints.size())
 							{
-								if (valuePointer >= (int)m_arPoints.size())
-								{
-									break;
+								break;
 
-                                    strVmlPath += L"l";
-									strVmlPath += FormatUtils::IntToWideString(m_arPoints[0].x);
-                                    strVmlPath += L",";
-									strVmlPath += FormatUtils::IntToWideString(m_arPoints[0].y);
-									
-									++valuePointer;
-									
-									//break;
-								}
-								else
-								{
-                                    strVmlPath += L"l";
-									strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x );
-                                    strVmlPath += L",";
-									strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y );
-									
-									++valuePointer;
-								}
+                                strVmlPath += L"l";
+								strVmlPath += FormatUtils::IntToWideString(m_arPoints[0].x);
+                                strVmlPath += L",";
+								strVmlPath += FormatUtils::IntToWideString(m_arPoints[0].y);
+								
+								++valuePointer;
+								
+								//break;
 							}
-						}
-						break;
-
-					case PathSegment::msopathCurveTo:
-						{
-							for (int i = 0; i < iter->Count; ++i)
+							else
 							{
-                                strVmlPath += L"c";
+                                strVmlPath += L"l";
 								strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x );
                                 strVmlPath += L",";
 								strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y );
-                                strVmlPath += L",";
-								strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 1].x );
-                                strVmlPath += L",";
-								strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 1].y );
-                                strVmlPath += L",";
-								strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 2].x );
-                                strVmlPath += L",";
-								strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 2].y );
-								valuePointer += 3;
+								
+								++valuePointer;
 							}
 						}
-						break;
+					}
+					break;
 
-					case PathSegment::msopathMoveTo:
+				case PathSegment::msopathCurveTo:
+					{
+						for (int i = 0; i < iter->Count; ++i)
 						{
-                            strVmlPath += L"m";
+							if (valuePointer + 3 > (int)m_arPoints.size()) 
+								break;
+                            strVmlPath += L"c";
 							strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x );
                             strVmlPath += L",";
 							strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y );
+                            strVmlPath += L",";
+							strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 1].x );
+                            strVmlPath += L",";
+							strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 1].y );
+                            strVmlPath += L",";
+							strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 2].x );
+                            strVmlPath += L",";
+							strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 2].y );
+							valuePointer += 3;
+						}
+					}
+					break;
+
+				case PathSegment::msopathMoveTo:
+					{
+						if (valuePointer < (int)m_arPoints.size()) 
+						{
+							strVmlPath += L"m";
+							strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x );
+							strVmlPath += L",";
+							strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y );
 							
 							++valuePointer;
 						}
-						break;
-
-					case PathSegment::msopathClose:
-						{
-                            strVmlPath += L"x";
-						}
-						break;
-
-					case PathSegment::msopathEnd:
-						{
-                            strVmlPath += L"e";
-						}
-						break;
-
-					case PathSegment::msopathEscape:
-						{
-							if (PathSegment::msopathEscapeNoFill == iter->EscapeCode)
-                                strVmlPath += L"nf";
-							
-							if (PathSegment::msopathEscapeNoLine == iter->EscapeCode)
-                                strVmlPath += L"ns";
-						}
-					case PathSegment::msopathClientEscape:
-					case PathSegment::msopathInvalid:
-						{
-							//ignore escape segments and invalid segments
-						}
-						break;
 					}
-				}
-				catch (...)
-				{
-					// Sometimes there are more Segments than available m_arPoints.
-					// Accordingly to the spec this should never happen :)
+					break;
+
+				case PathSegment::msopathClose:
+					{
+                        strVmlPath += L"x";
+					}
+					break;
+
+				case PathSegment::msopathEnd:
+					{
+                        strVmlPath += L"e";
+					}
+					break;
+
+				case PathSegment::msopathEscape:
+					{
+						if (PathSegment::msopathEscapeNoFill == iter->EscapeCode)
+                            strVmlPath += L"nf";
+						
+						if (PathSegment::msopathEscapeNoLine == iter->EscapeCode)
+                            strVmlPath += L"ns";
+					}
+				case PathSegment::msopathClientEscape:
+				case PathSegment::msopathInvalid:
+					{
+						//ignore escape segments and invalid segments
+					}
 					break;
 				}
 			}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/RecordFactory.cpp

@@ -50,6 +50,7 @@
 #include "GroupShapeRecord.h"
 #include "OfficeArtClientTextbox.h"
 #include "UnknownRecord.h"
+#include "OfficeArtFRITContainer.h"
 
 namespace DocFileFormat
 {
@@ -135,6 +136,7 @@ namespace DocFileFormat
 		case GroupContainer::TYPE_CODE_0xF003			:	return new GroupContainer();
 		case GroupShapeRecord::TYPE_CODE_0xF009			:	return new GroupShapeRecord ();
 		case OfficeArtClientTextbox::TYPE_CODE_0xF00D	:	return new OfficeArtClientTextbox ();
+		case OfficeArtFRITContainer::TYPE_CODE_0xF118	:	return new OfficeArtFRITContainer ();
 
 		default:	
 			return new UnknownRecord();		

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;
@@ -106,21 +123,20 @@ namespace DocFileFormat
 			return new ShapeContainer( _reader, bodySize, typeCode, version, instance );
 		}
 
-		std::list<OptionEntry> ExtractOptions() const
+		std::vector<OptionEntryPtr> ExtractOptions() const
 		{
-			std::list<OptionEntry> ret;
+			std::vector<OptionEntryPtr> ret;
 
 			//build the list of all option entries of this shape
 			for ( std::vector<Record*>::const_iterator iter = this->Children.begin(); iter != this->Children.end(); iter++ )
 			{
 				ShapeOptions* opt = dynamic_cast<ShapeOptions*>( *iter );
 
-				if ( opt != NULL )
+				if ( opt == NULL ) continue;
+				
+				for ( size_t i = 0; i < opt->Options.size(); i++)
 				{
-					for ( std::vector<OptionEntry>::iterator oeIter = opt->Options.begin(); oeIter != opt->Options.end(); oeIter++ )
-					{
-						ret.push_back( *oeIter );
-					}
+					ret.push_back( opt->Options[i]);
 				}
 			}
 

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeOptions.h

@@ -568,18 +568,19 @@ namespace DocFileFormat
 
 	struct OptionEntry
 	{
-		OptionEntry() :	pid(PropertyId_left), fBid(false), fComplex(false), op(0), opComplex(NULL) 
+		OptionEntry() :	pid(PropertyId_left), fBid(false), fComplex(false), op(0)
 		{
-
 		}
 
 		PropertyId		pid;
 		bool			fBid;
 		bool			fComplex;
 		unsigned int	op;
-		unsigned char*			opComplex;
+		std::shared_ptr<unsigned char>	opComplex;
 	};
 
+	typedef std::shared_ptr<OptionEntry> OptionEntryPtr;
+
 	class ShapeOptions: public Record
 	{
 	public: 
@@ -587,8 +588,8 @@ namespace DocFileFormat
 		static const unsigned short TYPE_CODE_0xF121 = 0xF121;
 		static const unsigned short TYPE_CODE_0xF122 = 0xF122;
 
-		std::vector<OptionEntry>			Options;
-		std::map<PropertyId, OptionEntry>	OptionsByID;
+		std::vector<OptionEntryPtr>				Options;
+		std::map<PropertyId, OptionEntryPtr>	OptionsByID;
 
 		ShapeOptions() : Record()
 		{
@@ -596,50 +597,35 @@ 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
-
-			OptionEntry entry;
 			//parse the flags and the simple values
 			for (unsigned int i = 0; i < instance; ++i)
 			{
+				OptionEntryPtr entry = std::shared_ptr<OptionEntry>(new OptionEntry());
 				unsigned short flag	=	Reader->ReadUInt16();
 
-				entry.pid			=	(PropertyId)FormatUtils::BitmaskToInt (flag, 0x3FFF);
-				entry.fBid			=	FormatUtils::BitmaskToBool (flag, 0x4000);
-				entry.fComplex		=	FormatUtils::BitmaskToBool (flag, 0x8000);
-				entry.op			=	Reader->ReadUInt32();
+				entry->pid			=	(PropertyId)FormatUtils::BitmaskToInt (flag, 0x3FFF);
+				entry->fBid			=	FormatUtils::BitmaskToBool (flag, 0x4000);
+				entry->fComplex		=	FormatUtils::BitmaskToBool (flag, 0x8000);
+				entry->op			=	Reader->ReadUInt32();
 
 				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)
-				{
-					int read_size =  (int)Options[i].op + 6 ; //???? 	
-					//todooo !!!! проверить все остальные !! тут размер в зависимости от типа Complex!!!		
-					switch(Options[i].pid)
-					{
-					case PropertyId::gtextUNICODE:
-					case PropertyId::gtextFont:
-						read_size =  (int)Options[i].op;
-						break;
-					}
-					Options[i].opComplex = Reader->ReadBytes( read_size, true );
+				if (Options[i]->fComplex && Options[i]->op > 0)
+				{			
+					Options[i]->opComplex = std::shared_ptr<unsigned char>(Reader->ReadBytes( Options[i]->op, true ));
 				}
 
-				OptionsByID.insert(std::pair<PropertyId, OptionEntry>(Options[i].pid, Options[i]));
+				OptionsByID.insert(std::make_pair(Options[i]->pid, Options[i]));
 			}
 
             Reader->Seek(( pos + size ), 0/*STREAM_SEEK_SET*/);

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"
@@ -73,7 +74,6 @@ namespace DocFileFormat
 
         NSDirectory::CreateDirectory( m_strOutputPath + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"_rels" );
 
-
 		WriteRelsFile( DocumentRelationshipsFile );
 
 		WriteRelsFile( FootnotesRelationshipsFile );
@@ -137,15 +137,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 +157,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);
 
@@ -199,7 +200,14 @@ namespace DocFileFormat
 	{
         return AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocument, L"");
 	}
-
+	int OpenXmlPackage::RegisterDocumentMacros()
+	{
+        return 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"" );
@@ -166,6 +166,7 @@ namespace DocFileFormat
 		HRESULT SaveEmbeddedObject	( const std::wstring& fileName, const std::string& data );
 
 		int RegisterDocument();
+		int RegisterDocumentMacros();
 		int RegisterFontTable();
 		int RegisterNumbering();
 		int RegisterSettings();
@@ -179,5 +180,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,9 +495,9 @@ 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) % DocFormatUtils::gc_nZeroWidth != 0)
+				if(_grid->at(i) % DocFileFormat::gc_nZeroWidth != 0)
 				{
 					bWriteGridCol = true;
 					break;
@@ -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

@@ -44,6 +44,8 @@
 #include "../../DesktopEditor/common/File.h"
 #include "../../DesktopEditor/raster/BgraFrame.h"
 
+using namespace DocFileFormat;
+
 typedef struct
 {
     DWORD   iType;              // Record type EMR_HEADER
@@ -136,47 +138,53 @@ namespace DocFileFormat
 		}
 		return btWin32;
 	}
-	bool ParseEmbeddedEquation( const std::string & xmlString, std::wstring & newXmlString)
+	bool VMLPictureMapping::ParseEmbeddedEquation( const std::string & xmlString, std::wstring & newXmlString)
 	{
 		newXmlString.clear();
-        std::wstring sTempXmlFile = NSDirectory::CreateTempFileWithUniqueName(
-                                                    NSDirectory::GetTempPath(), L"emb");
 
-		sTempXmlFile += L".xml";
-		
+		std::wstring sTempFolder = m_ctx->_doc->m_sTempFolder;
+		if (sTempFolder.empty())
+		{
+            sTempFolder = NSFile::CFileBinary::GetTempPath();
+		}
+
+		std::wstring sTempXmlFile = NSDirectory::CreateTempFileWithUniqueName(sTempFolder, L"emb");
+
 		NSFile::CFileBinary file; 
 		file.CreateFileW(sTempXmlFile);
 		file.WriteFile((BYTE*)xmlString.c_str(), xmlString.size());
 		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;
 							}
 						}
@@ -186,6 +194,7 @@ namespace DocFileFormat
 				if (res) break;
 			}
 		}
+		NSFile::CFileBinary::Remove(sTempXmlFile);
 		return res;
 	}
 //---------------------------------------------------------------
@@ -236,7 +245,7 @@ namespace DocFileFormat
 		std::wstring strHeight = FormatUtils::DoubleToWideString( height.ToPoints() );
 		std::wstring strStyle;
 	
-		std::list<OptionEntry> options;
+		std::vector<OptionEntryPtr> options;
 		
 		PictureFrameType type;
 		if ((pict->shapeContainer || pict->blipStoreEntry) && pict->shapeContainer->Children.size() > 0)
@@ -277,9 +286,9 @@ namespace DocFileFormat
 		}
 //todooo oбъединить с shape_mapping		
 
-		std::list<OptionEntry>::iterator end = options.end();
-		for (std::list<OptionEntry>::iterator iter = options.begin(); iter != end; ++iter)
+		for (size_t i = 0; i < options.size(); i++)
 		{
+			OptionEntryPtr & iter = options[i];
 			switch ( iter->pid )
 			{
 			case wzEquationXML:
@@ -287,7 +296,7 @@ namespace DocFileFormat
 					m_isEquation = true;
 					m_isEmbedded = true;
 					
-					m_embeddedData = std::string((char*)iter->opComplex, iter->op);
+					m_embeddedData = std::string((char*)iter->opComplex.get(), iter->op);
 
 					if (ParseEmbeddedEquation( m_embeddedData, m_equationXml))
 					{
@@ -297,8 +306,13 @@ namespace DocFileFormat
 			case metroBlob:
 				{
 					//встроенная неведомая хуйня
-					m_isEmbedded = true;
-					m_embeddedData = std::string((char*)iter->opComplex, iter->op);
+					m_isEmbedded	= true;
+					m_embeddedData	= std::string((char*)iter->opComplex.get(), iter->op);
+					
+					//if (ParseEmbeddedBlob( m_embeddedData, m_blobXml)) // todoooo
+					//{
+					//	m_isEmbedded = false;
+					//}
 				}break;
 //BORDERS
 			case borderBottomColor:
@@ -486,6 +500,7 @@ namespace DocFileFormat
 			{
 				case Global::msoblipEMF:
 				case Global::msoblipWMF:
+				case Global::msoblipPICT:
 				{
 					MetafilePictBlip* metaBlip = static_cast<MetafilePictBlip*>(oBlipEntry->Blip);
 					if (metaBlip)
@@ -553,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");
 		}
@@ -587,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/VMLPictureMapping.h

@@ -46,7 +46,6 @@ namespace DocFileFormat
 {
 	class OleObject;
 
-	bool ParseEmbeddedEquation( const std::string & xmlString, std::wstring & newXmlString );
 
 	class VMLPictureMapping: public PropertiesMapping, public IMapping
 	{
@@ -58,6 +57,7 @@ namespace DocFileFormat
 		/// Writes a border element
 		void writePictureBorder (const std::wstring & name, const BorderCode* brc);
 		void appendStyleProperty( std::wstring* b, const std::wstring& propName, const std::wstring& propValue ) const;
+		bool ParseEmbeddedEquation( const std::string & xmlString, std::wstring & newXmlString );
 	protected:
 		/// Copies the picture from the binary stream to the zip archive 
 		/// and creates the relationships for the image.

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -143,8 +143,9 @@ namespace DocFileFormat
 			ShapeContainer* groupShape		=	static_cast<ShapeContainer*>(container->Children[0]);
 			GroupShapeRecord* gsr			=	static_cast<GroupShapeRecord*>(groupShape->Children[0]);
 			Shape* shape					=	static_cast<Shape*>(groupShape->Children[1]);
-			std::list<OptionEntry> options	=	groupShape->ExtractOptions();
-			ChildAnchor* anchor				=	groupShape->FirstChildWithType<ChildAnchor>();
+			
+			ChildAnchor* anchor					=	groupShape->FirstChildWithType<ChildAnchor>();			
+			std::vector<OptionEntryPtr> options	=	groupShape->ExtractOptions();
 
 			m_shapeId = GetShapeID(shape);
 
@@ -155,14 +156,13 @@ namespace DocFileFormat
 			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString(gsr->rcgBounds.size.cx) + L"," + FormatUtils::IntToWideString(gsr->rcgBounds.size.cy)));
 
 			// Write wrap coords			
-			std::list<OptionEntry>::const_iterator end = options.end();
-			for (std::list<OptionEntry>::const_iterator iter = options.begin(); iter != end; ++iter)
+			for (size_t i = 0; i < options.size(); i++)
 			{
-				switch (iter->pid)
+				switch (options[i]->pid)
 				{
-				case pWrapPolygonVertices:
+					case pWrapPolygonVertices:
 					{
-						std::wstring wrapCoords	= getWrapCoords(*iter);
+						std::wstring wrapCoords	= GetWrapCoords(options[i]);
 						if (wrapCoords.length())
 							m_pXmlWriter->WriteAttribute(L"wrapcoords", wrapCoords);
 					}
@@ -226,9 +226,9 @@ namespace DocFileFormat
 		bool			freeform =	true;
 		std::wstring	sShapeId;
 
-		std::list<OptionEntry> options	=	pContainer->ExtractOptions();
-		ChildAnchor* pAnchor			=	pContainer->FirstChildWithType<ChildAnchor>();
-		ClientAnchor* clientAnchor		=	pContainer->FirstChildWithType<ClientAnchor>();
+		std::vector<OptionEntryPtr> options	=	pContainer->ExtractOptions();
+		ChildAnchor* pAnchor				=	pContainer->FirstChildWithType<ChildAnchor>();
+		ClientAnchor* clientAnchor			=	pContainer->FirstChildWithType<ClientAnchor>();
 
 		WriteBeginShapeNode (pShape);
 
@@ -247,9 +247,8 @@ namespace DocFileFormat
 			{
 				freeform =	false;
 				m_pXmlWriter->WriteAttribute( L"type", (std::wstring(L"#") + VMLShapeTypeMapping::GenerateTypeId(pShape->GetShapeType())));
-
-			m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(pShape, pAnchor, options, pContainer->Index)));
 			}
+			m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(pShape, pAnchor, options, pContainer->Index)));
 
 			if (pShape->is<LineType>())
 			{
@@ -289,18 +288,23 @@ namespace DocFileFormat
 		int ndyTextBottom		=	-1;
 
 		bool bHavePath			=	false;
+		int nShapePath			=	-1;
 		int	nAdjValues			=	0;
 		int	nLTxID				=	-1;
 
 		std::wstring					sTextboxStyle;
 		
-		std::wstring					adjValues[8];
 		ShadowStyleBooleanProperties	shadowBoolean(0);
-		std::vector<std::wstring>		arrInscribe;
+		
+		OptionEntryPtr				opSegmentInfo;
+		OptionEntryPtr				opVerticles;
+		OptionEntryPtr				opInscribe;
+		OptionEntryPtr				opConnectAngles;
+		OptionEntryPtr				opConnectLocs;
 
-		std::list<OptionEntry>::const_iterator end = options.end();
-		for (std::list<OptionEntry>::const_iterator iter = options.begin(); iter != end; ++iter)
+		for (size_t i = 0; i < options.size(); i++)
 		{
+			OptionEntryPtr & iter = options[i];
 			switch (iter->pid)
 			{
 	//BOOLEANS
@@ -335,19 +339,16 @@ namespace DocFileFormat
 					}
 				}
 				break;
-
 			case protectionBooleans:
 				{
 					ProtectionBooleanProperties booleans(iter->op);
 				}
 				break;
-
 			case diagramBooleans:
 				{
 					DiagramBooleanProperties booleans(iter->op);
 				}
 				break;
-
 			case groupShapeBooleans:
 				{
 					GroupShapeBooleanProperties booleans(iter->op);
@@ -357,56 +358,81 @@ namespace DocFileFormat
 					}
 				}
 				break;
-
-				// GEOMETRY
-
+// GEOMETRY
+			case shapePath :
+				{
+					bHavePath =	true;
+					nShapePath = iter->op;
+				}break;
+			case pVertices:
+				{
+					opVerticles = iter;
+				}break;
+			case pSegmentInfo:
+				{
+					opSegmentInfo = iter;
+				}break;
+			case pGuides:
+				{
+					GetGuides(iter);
+				}break;
+			case pConnectionSites:
+				{
+					opConnectLocs = iter;
+				}break;
+			case pConnectionSitesDir:
+				{
+					opConnectAngles	= iter;
+				}break;
+			case pInscribe:
+				{
+					opInscribe	= iter;
+				}break;
 			case adjustValue:
 				{
-					adjValues[0]	=	FormatUtils::IntToWideString( (int)iter->op );
-                    nAdjValues		=	(std::max)(nAdjValues,1);
+					m_nAdjValues[0] = (int)iter->op;
+                    nAdjValues		= (std::max)(nAdjValues,1);
 				}
 				break;
-
 			case adjust2Value:
 				{
-					adjValues[1]	=	FormatUtils::IntToWideString( (int)iter->op );
-                    nAdjValues		=	(std::max)(nAdjValues,2);
+					m_nAdjValues[1] = (int)iter->op;
+                    nAdjValues		= (std::max)(nAdjValues, 2);
 				}
 				break;
-
 			case adjust3Value:
 				{
-					adjValues[2]	=	FormatUtils::IntToWideString( (int)iter->op );
-                    nAdjValues		=	(std::max)(nAdjValues,3);
+					m_nAdjValues[2] = (int)iter->op;
+                    nAdjValues		=(std::max)(nAdjValues, 3);
 				}break;
 			case adjust4Value:
 				{
-					adjValues[3]	=	FormatUtils::IntToWideString( (int)iter->op );
-                    nAdjValues		=	(std::max)(nAdjValues,4);
+					m_nAdjValues[3] = (int)iter->op;
+                    nAdjValues		= (std::max)(nAdjValues, 4);
 				}break;
 			case adjust5Value:
 				{
-					adjValues[4]	=	FormatUtils::IntToWideString( (int)iter->op );
-                    nAdjValues		=	(std::max)(nAdjValues,5);
+					m_nAdjValues[4] = (int)iter->op;
+                    nAdjValues		= (std::max)(nAdjValues, 5);
 				}break;
 			case adjust6Value:
 				{
-					adjValues[5]	=	FormatUtils::IntToWideString( (int)iter->op );
-                    nAdjValues		=	(std::max)(nAdjValues,6);
+					m_nAdjValues[5] = (int)iter->op;
+                    nAdjValues		= (std::max)(nAdjValues, 6);
 				}break;
 			case adjust7Value:
 				{
-					adjValues[6]	=	FormatUtils::IntToWideString( (int)iter->op );
-                    nAdjValues		=	(std::max)(nAdjValues,7);
+					m_nAdjValues[6] = (int)iter->op;
+                    nAdjValues		= (std::max)(nAdjValues, 7);
 				}break;
 			case adjust8Value:
 				{
-					adjValues[7]	=	FormatUtils::IntToWideString( (int)iter->op );
-                    nAdjValues		=	(std::max)(nAdjValues,8);
+					m_nAdjValues[7] = (int)iter->op;
+                    nAdjValues		= (std::max)(nAdjValues, 8);
 				}break;
 			case pWrapPolygonVertices:
 				{
-					std::wstring wrapCoords = getWrapCoords(*iter);
+					std::wstring wrapCoords = GetWrapCoords(iter);
 
 					if (!wrapCoords.empty())
 					{
@@ -421,14 +447,7 @@ namespace DocFileFormat
 				{
 					yCoord = iter->op;
 				}break;
-			case pGuides:
-				{
-				}break;
-			case pInscribe:
-				{
-					arrInscribe = GetTextRectangles(*iter);
-				}break;
-// OUTLINE
+// LINE
 			case lineColor:
 				{
 					RGBColor lineColor((int)iter->op, RedFirst);
@@ -475,6 +494,21 @@ namespace DocFileFormat
 				{
 					appendValueAttribute(&m_stroke, L"startarrowwidth", getArrowWidth( iter->op ));
 				}break;
+			case cxstyle:
+				{
+					if (pShape->GetShapeType() == NULL)
+					{
+						freeform = false;
+						m_pXmlWriter->WriteAttribute(L"type", L"#_x0000_t32");
+					}
+					switch(iter->op)
+					{
+						case 0:	m_pXmlWriter->WriteAttribute(L"o:connectortype", L"straight");	break;
+						case 1:	m_pXmlWriter->WriteAttribute(L"o:connectortype", L"elbow");		break;
+						case 2:	m_pXmlWriter->WriteAttribute(L"o:connectortype", L"curved");	break;
+						case 3:	m_pXmlWriter->WriteAttribute(L"o:connectortype", L"none");		break;
+					}
+				}break;
 // FILL
 			case fillColor:
 				{
@@ -497,7 +531,7 @@ namespace DocFileFormat
 				}break;
 			case fillShadeColors:
 				{
-					appendValueAttribute(&m_fill, L"colors", getFillColorString( iter->opComplex, iter->op ));
+					appendValueAttribute(&m_fill, L"colors", getFillColorString( iter->opComplex.get(), iter->op ));
 				}break;
 			case fillFocus:
 				{
@@ -526,6 +560,14 @@ namespace DocFileFormat
 						appendValueAttribute(&m_fill, L"r:id", std::wstring(( L"rId" ) + FormatUtils::IntToWideString(m_nImageId) ));
 					}
 				}break;
+			case fillBlipName:
+				{
+					std::wstring name;
+					FormatUtils::GetSTLCollectionFromBytes<std::wstring>(&name, iter->opComplex.get(), iter->op, ENCODING_UTF16);
+					if (!name.empty())
+						appendValueAttribute(&m_fill, L"o:title", FormatUtils::XmlEncode(name));
+
+				}break;
 			case fillOpacity:
 				{
 					appendValueAttribute(&m_fill, L"opacity", ( FormatUtils::IntToWideString( iter->op ) + L"f" ));
@@ -602,7 +644,7 @@ namespace DocFileFormat
 			case pibName:
 				{
 					std::wstring name;
-					FormatUtils::GetSTLCollectionFromBytes<std::wstring>(&name, iter->opComplex, iter->op, ENCODING_UTF16);
+					FormatUtils::GetSTLCollectionFromBytes<std::wstring>(&name, iter->opComplex.get(), iter->op, ENCODING_UTF16);
 					if (!name.empty())
 						appendValueAttribute(&m_imagedata, L"o:title", FormatUtils::XmlEncode(name));
 				}break;
@@ -676,10 +718,10 @@ namespace DocFileFormat
 					hasTextbox	=	true;
 					nLTxID		=	(((iter->op) >> 16) & 0xFFFF);
 				}break;
-			case dxTextLeft:	{ndxTextLeft	= (int)iter->op;break;}
-			case dyTextTop:		{ndyTextTop		= (int)iter->op;break;}
-			case dxTextRight:	{ndxTextRight	= (int)iter->op;break;}
-			case dyTextBottom:	{ndyTextBottom	= (int)iter->op;break;}
+			case dxTextLeft:	{ndxTextLeft	= (int)iter->op;	break;}
+			case dyTextTop:		{ndyTextTop		= (int)iter->op;	break;}
+			case dxTextRight:	{ndxTextRight	= (int)iter->op;	break;}
+			case dyTextBottom:	{ndyTextBottom	= (int)iter->op;	break;}
 			case txflTextFlow:
 				{
 					switch(iter->op)
@@ -700,11 +742,11 @@ namespace DocFileFormat
 // Word Art
 			case gtextUNICODE:
 				{
-					std::wstring text = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex, (iter->op)/2);
+					std::wstring text = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex.get(), (iter->op)/2);
 
 					text = FormatUtils::XmlEncode(text);
 
-					if (0 <= text.find(L"\n"))
+					if (std::wstring::npos != text.find(L"\n"))
 					{
 						m_textpath.AppendText(text);
 					}
@@ -713,8 +755,8 @@ namespace DocFileFormat
 				}break;
 			case gtextFont:
 				{
-					std::wstring font = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex, (iter->op)/2);
-					int i = font.size();
+					std::wstring font = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex.get(), (iter->op)/2);
+					size_t i = font.size();
 					while (i > 0)
 					{
 						if (font[i-1] != 0) break;
@@ -764,31 +806,31 @@ namespace DocFileFormat
 						appendStyleProperty(&m_textPathStyle, L"font-weight", L"bold");
 					}
 				}break;
-  // PATH
-				case shapePath :
-				{
-					bHavePath			=	true;
-
-					std::wstring path	=	ParsePath(options);
-
-					if (false == path.empty())
-						m_pXmlWriter->WriteAttribute (L"path", path);
-				}break;
-				default:
+			default:
 				{
 					int val = iter->op;
 				}break;
 			}
 		}
 
-		if (false == bHavePath)		//	фигура может быть задана только наборами вершин и индексов
+		if (opVerticles && opSegmentInfo)
 		{
-			std::wstring path	=	ParsePath(options);
+			const unsigned char*	pVP	=	opVerticles->opComplex.get();
+			unsigned int			nVP	=	opVerticles->op;
+			const unsigned char*	pSI	=	opSegmentInfo->opComplex.get();
+			unsigned int			nSI	=	opSegmentInfo->op;
+		
+			PathParser oParser (pSI, nSI, pVP, nVP, m_arrGuides);
+			std::wstring path	=	oParser.GetVmlPath();
 
 			if (false == path.empty())
 				m_pXmlWriter->WriteAttribute (L"path", path);
 		}
-
+		if (freeform && (xCoord == 0 || yCoord == 0 ))
+		{
+			xCoord = 21600;
+			yCoord = 21600;
+		}
 		if ( !filled )
 		{
 			m_pXmlWriter->WriteAttribute( L"filled", L"f" );
@@ -804,10 +846,10 @@ namespace DocFileFormat
 			m_pXmlWriter->WriteAttribute(L"o:allowincell", L"f");
 		}
 
-		if ( ( xCoord > 0 ) && ( yCoord > 0 ) )
+		if ( xCoord > 0 && yCoord > 0 )
 		{
 			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString( xCoord ) + L"," + FormatUtils::IntToWideString( yCoord ) ));
-		}
+		} 
 
 		int nCode	=	0;
 		if (pShape->GetShapeType())
@@ -819,17 +861,17 @@ namespace DocFileFormat
 		{
 			if (nAdjValues)												
 			{
-				m_pXmlWriter->WriteAttribute(L"arcsize", adjValues[0]);
+				m_pXmlWriter->WriteAttribute(L"arcsize", m_nAdjValues[0]);
 			}
 		}
 		else
 		{
-			if (nAdjValues)												
+			if (nAdjValues > 0)												
 			{
-				std::wstring adjTag	= adjValues[0];
+				std::wstring adjTag	= std::to_wstring(m_nAdjValues[0]);
 
 				for (int i = 1; i < nAdjValues; ++i)
-					adjTag += std::wstring(L",") + adjValues[i];
+					adjTag += L"," + std::to_wstring(m_nAdjValues[i]);
 
 				m_pXmlWriter->WriteAttribute(L"adj", adjTag);
 			}
@@ -982,10 +1024,24 @@ namespace DocFileFormat
 		}
 		if (freeform)
 		{
-			if (arrInscribe.size())
+			if (opInscribe || opConnectAngles || opConnectLocs)
 			{
+				std::vector<std::wstring>	arrInscribe			= GetTextRectangles(opInscribe);
+				std::wstring				strConnectAngles	= GetConnectAngles(opConnectAngles);
+				std::wstring				strConnectLocs		= GetConnectLocs(opConnectLocs);
+				
 				m_pXmlWriter->WriteNodeBegin(L"v:path", true);
-				m_pXmlWriter->WriteAttribute(L"textboxrect", arrInscribe[0]);
+				if (!arrInscribe.empty())
+					m_pXmlWriter->WriteAttribute(L"textboxrect", arrInscribe[0]);
+				if (!strConnectAngles.empty() || !strConnectLocs.empty())
+				{
+					m_pXmlWriter->WriteAttribute(L"o:connecttype", L"custom");
+					if (!strConnectLocs.empty())
+						m_pXmlWriter->WriteAttribute(L"o:connectlocs", strConnectLocs);
+					if (!strConnectAngles.empty())
+						m_pXmlWriter->WriteAttribute(L"o:connectangles", strConnectAngles);
+				}
+
 				m_pXmlWriter->WriteNodeEnd(L"", true);
 			}
 		}
@@ -1182,11 +1238,13 @@ namespace DocFileFormat
 	}
 
 	/// Build the VML wrapcoords string for a given pWrapPolygonVertices
-	std::wstring VMLShapeMapping::getWrapCoords(const OptionEntry& pWrapPolygonVertices) const
+	std::wstring VMLShapeMapping::GetWrapCoords(const OptionEntryPtr& pWrapPolygonVertices) const
 	{
+		if (!pWrapPolygonVertices) return L"";
+
 		std::wstring coords;
 
-		MemoryStream oStream(pWrapPolygonVertices.opComplex, pWrapPolygonVertices.op);
+		MemoryStream oStream(pWrapPolygonVertices->opComplex.get(), pWrapPolygonVertices->op);
 		std::list<int> arrVertices;
 
 		unsigned short nElems		=	oStream.ReadUInt16();
@@ -1229,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));
@@ -1315,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" );
 		}
@@ -1385,7 +1447,7 @@ namespace DocFileFormat
 	{
 		if ((style != NULL) && (anchor != NULL))
 		{
-			DocFormatUtils::Rectangle bounds = anchor->rcgBounds;
+			DocFileFormat::Rectangle bounds = anchor->rcgBounds;
 
 			if (twistDimensions)
 			{
@@ -1498,7 +1560,7 @@ namespace DocFileFormat
 		}
 	}
 
-	void VMLShapeMapping::AppendOptionsToStyle (std::wstring* oStyle, const std::list<OptionEntry>& options, int zIndex) const
+	void VMLShapeMapping::AppendOptionsToStyle (std::wstring* oStyle, const std::vector<OptionEntryPtr>& options, int zIndex) const
 	{
 		bool bRelH = false;
 		bool bRelV = false;
@@ -1508,9 +1570,9 @@ namespace DocFileFormat
 
 		bool bZIndex = false;
 
-		std::list<OptionEntry>::const_iterator end = options.end();
-		for (std::list<OptionEntry>::const_iterator iter = options.begin(); iter != end; ++iter)
+		for (size_t i = 0; i < options.size(); i++)
 		{
+			const OptionEntryPtr & iter = options[i];
 			switch (iter->pid)
 			{
 //	POSITIONING
@@ -1597,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)
 		{
@@ -1616,15 +1678,16 @@ namespace DocFileFormat
 	}
 
 	//
-	std::wstring VMLShapeMapping::buildStyle (const Shape* shape, const ChildAnchor* anchor, const std::list<OptionEntry>& options, int zIndex) const
+	std::wstring VMLShapeMapping::buildStyle (const Shape* shape, const ChildAnchor* anchor, const std::vector<OptionEntryPtr>& options, int zIndex) const
 	{
 		std::wstring style;
 
-		// Check if some properties are set that cause the dimensions to be twisted
 		bool twistDimensions = false;
-		std::list<OptionEntry>::const_iterator end = options.end();
-		for (std::list<OptionEntry>::const_iterator iter = options.begin(); iter != end; ++iter)
+		
+		for (size_t i = 0; i < options.size(); i++)
 		{
+			const OptionEntryPtr & iter = options[i];
+
 			if (geometryTextBooleanProperties ==  iter->pid)
 			{
 				GeometryTextBooleanProperties props(iter->op);
@@ -1848,73 +1911,223 @@ 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;
 			}
 		}
 
 		return wrapType;
 	}
-
-	std::wstring VMLShapeMapping::ParsePath (const std::list<OptionEntry>& options) const
+	std::wstring VMLShapeMapping::GetConnectAngles(const OptionEntryPtr& opAngles) const
 	{
-		const unsigned char* pVP		=	NULL;
-		unsigned int nVP	=	0;
-		const unsigned char* pSI		=	NULL;
-		unsigned int nSI	=	0;
+		if (!opAngles)				return L"";
+		if (!opAngles->opComplex)	return L"";
 		
-		std::list<OptionEntry>::const_iterator end = options.end();
-		for (std::list<OptionEntry>::const_iterator iter = options.begin(); iter != end; ++iter)
+		MemoryStream reader(opAngles->opComplex.get(), opAngles->op);
+
+		unsigned short nElems		=	reader.ReadUInt16();
+		unsigned short nElemsAlloc	=	reader.ReadUInt16();
+		unsigned short nElemSize	=	reader.ReadUInt16();
+
+		bool bTruncated = false;
+
+        if (0xFFF0 == nElemSize)
+        {
+            nElemSize = 4;
+            bTruncated = true;
+        }
+
+        long dwSize = nElems * nElemSize;
+
+        if (opAngles->op - 6 != (dwSize))
+        {
+            bool b = false;
+        }
+		if (nElemSize < 1) return L"";
+
+		int count = dwSize / nElemSize; 
+
+		std::wstring angles;
+		for (int i = 0; i < count; ++i)
 		{
-			if (iter->pid == pVertices)
-			{
-				pVP =	iter->opComplex;
-				nVP	=	iter->op;	
-			}
-
-			if (iter->pid == pSegmentInfo)
-			{
-				pSI =	iter->opComplex;
-				nSI	=	iter->op;	
-			}
+            DWORD v = reader.ReadUInt32();
+			double val = (double)((WORD)(v >> 16) + ((WORD)(v) / 65536.0));
+			angles += std::to_wstring((int)val) + (i < (count - 1) ? L"," : L"");
 		}
+		return angles;
+	}
+	int VMLShapeMapping::UpdateFromGuides(const int val)  const
+	{
+		int new_val = val;
+        LONG lMinF = (LONG)0x80000000;
+        if (lMinF <= val)
+        {
+            int index = (DWORD)val - 0x80000000;
+		
+			if (index >= 0 && index < (int)m_arrGuides.size())
+			{
+				new_val = m_arrGuides[index].param3;
+			}
 
-		PathParser oParser (pSI, nSI, pVP, nVP);
-		return oParser.GetVmlPath();
+        }
+		return new_val;
+	}
+	void VMLShapeMapping::GetGuides( const OptionEntryPtr& opGuides )
+	{
+		if (!opGuides)				return;
+		if (!opGuides->opComplex)	return;
+		
+		MemoryStream reader(opGuides->opComplex.get(), opGuides->op);
+
+		unsigned short nElems		=	reader.ReadUInt16();
+		unsigned short nElemsAlloc	=	reader.ReadUInt16();
+		unsigned short nElemSize	=	reader.ReadUInt16();
+
+		bool bTruncated = false;
+
+        if (0xFFF0 == nElemSize)
+        {
+            nElemSize = 4;
+            bTruncated = true;
+        }
+        long dwSize = nElems * nElemSize;
+
+        if (opGuides->op - 6 != (dwSize))
+        {
+            bool b = false;
+        }
+		int count = dwSize / nElemSize;  //1x (int or short)
+		for (int i = 0; i < count; ++i)
+		{
+			_guides g;
+			WORD flags	= reader.ReadUInt16();
+
+			g.type = flags & 0x1FFF;
+
+			g.param_type1 = (unsigned char)(flags & 0x04);
+			g.param_type2 = (unsigned char)(flags & 0x02);
+			g.param_type3 = (unsigned char)(flags & 0x01);
+
+			g.param1	= reader.ReadUInt16();
+			g.param2	= reader.ReadUInt16();
+			g.param3	= reader.ReadUInt16();
+
+			m_arrGuides.push_back(g);
+		}
 	}
 
-	//
-	std::vector<std::wstring> VMLShapeMapping::GetTextRectangles(const OptionEntry& inscribe) const 
+	std::wstring VMLShapeMapping::GetConnectLocs( const OptionEntryPtr& opLocs ) const
 	{
-		MemoryStream reader(inscribe.opComplex, inscribe.op + 6);
+		if (!opLocs)			return L"";
+		if (!opLocs->opComplex) return L"";
 
-		unsigned short elems		=	reader.ReadUInt16();
-		unsigned short allocElems	=	reader.ReadUInt16();
-		unsigned short cb			=	reader.ReadUInt16();
-	
+		MemoryStream reader(opLocs->opComplex.get(), opLocs->op);
+
+		unsigned short nElems		=	reader.ReadUInt16();
+		unsigned short nElemsAlloc	=	reader.ReadUInt16();
+		unsigned short nElemSize	=	reader.ReadUInt16();
+
+		bool bTruncated = false;
+
+        if (0xFFF0 == nElemSize)
+        {
+            nElemSize = 4;
+            bTruncated = true;
+        }
+
+        long dwSize = nElems * nElemSize;
+
+        if (opLocs->op - 6 != (dwSize))
+        {
+            bool b = false;
+        }
+		int count = dwSize / nElemSize;  //2x (int or short)
+		
+		std::wstring locs;
+		for (int i = 0; i < count; ++i)
+		{
+			POINT pt;
+
+			if (bTruncated)
+			{
+				pt.x =	reader.ReadInt16();
+				pt.y =	reader.ReadInt16();
+			}
+			else
+			{
+				pt.x =	reader.ReadInt32();
+				pt.y =	reader.ReadInt32();
+			}
+           
+			pt.x = UpdateFromGuides(pt.x);
+			pt.y = UpdateFromGuides(pt.y);
+			
+			locs += std::to_wstring(pt.x) + L"," + std::to_wstring(pt.y) + (i < (count - 1) ? L";" : L"");
+		}
+
+		return locs;
+	}
+
+	std::vector<std::wstring> VMLShapeMapping::GetTextRectangles( const OptionEntryPtr& opInscribe ) const
+	{
 		std::vector<std::wstring> rectangles;
+		
+		if (!opInscribe) return rectangles;
+		if (!opInscribe->opComplex) return rectangles;
 
-		if (16 != cb) return rectangles; // TODO: доделать
+		MemoryStream reader(opInscribe->opComplex.get(), opInscribe->op);
 
-		int count = (inscribe.op) / 16;
+		unsigned short nElems		=	reader.ReadUInt16();
+		unsigned short nElemsAlloc	=	reader.ReadUInt16();
+		unsigned short nElemSize	=	reader.ReadUInt16();
 
+		bool bTruncated = false;
+
+        if (0xFFF0 == nElemSize)
+        {
+            nElemSize = 4;
+            bTruncated = true;
+        }
+        else nElemSize = 2;
+
+        long dwSize = nElems * nElemSize;
+
+        if (opInscribe->op - 6 != (dwSize))
+        {
+            bool b = false;
+        }
+		int count = dwSize / nElemSize; //4x (int or short)
+		
 		for (int i = 0; i < count; ++i)
 		{
 			RECT rc;
 
-			rc.top		=	reader.ReadInt32();
-			rc.left		=	reader.ReadInt32();
-			rc.right	=	reader.ReadInt32();
-			rc.bottom	=	reader.ReadInt32();
+			if (bTruncated)
+			{
+				rc.top		=	reader.ReadInt16();
+				rc.left		=	reader.ReadInt16();
+				rc.right	=	reader.ReadInt16();
+				rc.bottom	=	reader.ReadInt16();
+			}
+			else
+			{
+				rc.top		=	reader.ReadInt32();
+				rc.left		=	reader.ReadInt32();
+				rc.right	=	reader.ReadInt32();
+				rc.bottom	=	reader.ReadInt32();
+			}
+			rc.top		= UpdateFromGuides(rc.top);
+			rc.left		= UpdateFromGuides(rc.left);
+			rc.right	= UpdateFromGuides(rc.right);
+			rc.bottom	= UpdateFromGuides(rc.bottom);
 
-			std::wstringstream sstream;
-			sstream << boost::wformat(L"%d,%d,%d,%d") % rc.top % rc.left % rc.right % rc.bottom; 
-			rectangles.push_back(sstream.str());
+			rectangles.push_back(	std::to_wstring(rc.top)		+ L","	+ std::to_wstring(rc.left) + L"," + 
+									std::to_wstring(rc.right)	+ L","	+ std::to_wstring(rc.bottom));
 		}
 
 		return rectangles;
@@ -1923,7 +2136,7 @@ namespace DocFileFormat
 	
 	void VMLShapeMapping::ApplyPrimitives(DrawingPrimitives * primitives)
 	{
-		int index = 0;
+		size_t index = 0;
 
 		while(true)
 		{
@@ -1935,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++;
@@ -2034,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,21 +73,14 @@ 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);
 
-		// Converts a group of shapes
 		void WriteGroup(const GroupContainer* pContainer);
-		// Converts a single shape
 		void WriteShape (const ShapeContainer* pContainer);
 
-		/// Generates a string id for the given shape
 		std::wstring GenShapeId(const Shape* pShape) const;
-		/// Build the VML wrapcoords string for a given pWrapPolygonVertices
-		std::wstring getWrapCoords( const OptionEntry& pWrapPolygonVertices ) const;
-		/// Copies the picture from the binary stream to the zip archive 
-		/// and creates the relationships for the image.
 		bool copyPicture( const BlipStoreEntry* bse );
 		std::wstring GetTargetExt( Global::BlipType _type ) const;
 		
@@ -98,21 +91,22 @@ namespace DocFileFormat
 		
 		std::wstring getTextboxAnchor( unsigned int anchor ) const;
 				
-		void AppendOptionsToStyle( std::wstring* style, const std::list<OptionEntry>& options, int zIndex ) const;
+		std::wstring buildStyle		( const Shape* shape, const ChildAnchor* anchor, const std::vector<OptionEntryPtr>& options, int zIndex ) const;
+		void AppendOptionsToStyle	( std::wstring* style, const std::vector<OptionEntryPtr>& options, int zIndex ) const;
 		
-		std::wstring buildStyle		( const Shape* shape, const ChildAnchor* anchor, const std::list<OptionEntry>& options, int zIndex ) const;
+		int UpdateFromGuides(const int val) const;
+
 		std::wstring getLineStyle	( unsigned int p ) const;
 		std::wstring getArrowStyle	( unsigned int op ) const;
 		std::wstring getArrowLength	( unsigned int op ) const;
 		std::wstring getArrowWidth	( unsigned int op ) const;
 		std::wstring getFillMethod	( unsigned int p ) const;
 		std::wstring getFillColorString( const unsigned char* p, unsigned int size ) const;
-		/// Returns the OpenXML fill type of a fill effect
+
 		std::wstring getFillType	( unsigned int p ) const;
 		std::wstring getShadowType	( unsigned int p ) const;
-		/// Returns the OpenXML wrap type of the shape
+
 		std::wstring getWrapType	(const Spa* pSpa) const;
-		std::wstring ParsePath		(const std::list<OptionEntry>& options) const;
 
 		void WriteBeginShapeNode	(const Shape* pShape);
 		void WriteEndShapeNode		(const Shape* pShape);
@@ -121,9 +115,15 @@ namespace DocFileFormat
 		std::wstring GetLineFrom	(const ChildAnchor* pAnchor) const;
 		std::wstring GetLineTo		(const ChildAnchor* pAnchor) const;
 
-		std::vector<std::wstring> GetTextRectangles(const OptionEntry& inscribe) const;
+		std::wstring				GetWrapCoords		( const OptionEntryPtr& pOpt ) const;
+		std::vector<std::wstring>	GetTextRectangles	( const OptionEntryPtr& pOpt ) const;
+		std::wstring				GetConnectAngles	( const OptionEntryPtr& pOpt ) const;
+		std::wstring				GetConnectLocs		( const OptionEntryPtr& pOpt ) const;
+		void						GetGuides			( const OptionEntryPtr& pOpt );
 
-	private: 
+		int								m_nAdjValues[8];
+		std::vector<_guides>			m_arrGuides;
+		
 		bool							m_isInlineShape;
 		Spa*							m_pSpa;
 		IMapping*						m_pCaller;

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;
@@ -197,20 +197,20 @@ public:
 			int cchSize = 1;
 			cch = ReadBytes( cchSize, true );
 
-			int xstzSize = FormatUtils::BytesToUChar( cch, 0, cchSize ) * 1;      
+            int xstzSize = DocFileFormat::FormatUtils::BytesToUChar( cch, 0, cchSize ) * 1;
 			xstz = ReadBytes(xstzSize, true);
 
-			FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_WINDOWS_1250 );
+            DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_WINDOWS_1250 );
 		}
 		else
 		{
 			int cchSize = 2;
 			cch = ReadBytes( cchSize, true );
 
-			int xstzSize = FormatUtils::BytesToInt16( cch, 0, cchSize ) * 2;      
+            int xstzSize = DocFileFormat::FormatUtils::BytesToInt16( cch, 0, cchSize ) * 2;
 			xstz = ReadBytes(xstzSize, true);
 
-			FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_UTF16 );
+            DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_UTF16 );
 		}
 
 		RELEASEARRAYOBJECTS(xstz);
@@ -234,7 +234,7 @@ public:
 			//dont read the terminating zero
 			unsigned char* stringBytes = ReadBytes( ( cch * 2 ), true );
 
-			FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( ( cch * 2 ) - 2 ), ENCODING_UTF16 );
+            DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( ( cch * 2 ) - 2 ), ENCODING_UTF16 );
 
 			RELEASEARRAYOBJECTS( stringBytes );
 		}
@@ -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 );
 
@@ -278,7 +278,7 @@ public:
 				//dont read the terminating zero
 				stringBytes = ReadBytes( cch, true );
 
-				FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( cch - 1 ), ENCODING_WINDOWS_1250);
+                DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( cch - 1 ), ENCODING_WINDOWS_1250);
 
 			}
 		RELEASEARRAYOBJECTS( stringBytes );

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);
 			}
 		}
 
@@ -139,7 +180,7 @@ namespace DocFileFormat
 
 			if (encryptionHeader->bStandard)
 			{
-				CRYPT::RC4Decryptor Decryptor(encryptionHeader->crypt_data_rc4, m_sPassword, 1);
+				CRYPT::RC4Decryptor Decryptor(encryptionHeader->crypt_data_rc4, m_sPassword);
 
 				if (Decryptor.IsVerify() == false) 
 				{
@@ -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,23 +555,28 @@ namespace DocFileFormat
 			delete storageOut;
 			return false;
 		}
-		std::list<std::string> listStream = storageIn->entries();
+		DecryptStream( 0, L"/", storageIn, storageOut, Decryptor);
 
-		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);
+		//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);
+		//	}
+
+		//}
 
-		}
 		storageOut->close();
 		delete storageOut;
 
@@ -496,52 +586,95 @@ 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;
 	}
+	void WordDocument::DecryptStream( int level, std::wstring path, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor)
+	{
+		std::list<std::wstring> entries, entries_files, entries_dir;
+		entries = storageIn->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( 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 );
 
+		}    
+	//if (bSortFiles)
+		entries_files.sort();
 
-	bool WordDocument::DecryptStream(CRYPT::Decryptor* Decryptor, std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut)
+		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(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 sz_stream = stream->size();
+		POLE::uint64 size_stream = stream->size();
 		
-		POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, sz_stream);
+		POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, size_stream);
 		if (!streamNew) return false;
 
-		unsigned char* data_stream = new unsigned char[sz_stream];
-		stream->read(data_stream, sz_stream);
+		unsigned char* data_stream = new unsigned char[size_stream];
+		stream->read(data_stream, size_stream);
 
 		unsigned char* data_store = NULL;
-		int sz_data_store = 0;
+		int size_data_store = 0;		
 		
-		if ("WordDocument" == streamName)
+		if ( std::wstring::npos != streamName.find(L"WordDocument") )
 		{
-			sz_data_store = 68;
-			data_store = new unsigned char[sz_data_store];
+			size_data_store = 68;
+			data_store = new unsigned char[size_data_store];
 		}
 		
 		if (data_store)
-			memcpy(data_store, data_stream, sz_data_store);
+			memcpy(data_store, data_stream, size_data_store);
+
+		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;
+
+			Decryptor->Decrypt((char*)data_stream + pos, size_block, block);
+		}
 
-		Decryptor->Decrypt((char*)data_stream, sz_stream, 0);
 		
 		if (data_store)
-			memcpy(data_stream, data_store, sz_data_store);
+			memcpy(data_stream, data_store, size_data_store);
 
-		streamNew->write(data_stream, sz_stream);
+		streamNew->write(data_stream, size_stream);
 
 		RELEASEARRAYOBJECTS(data_store);
 		RELEASEARRAYOBJECTS(data_stream);
@@ -622,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;
@@ -86,6 +85,7 @@ namespace DocFileFormat
 		friend class Table;
 		friend class TableRow;
 		friend class VMLShapeMapping;
+		friend class VMLPictureMapping;
 		friend class OpenXmlPackage;
 		friend class TextboxMapping;
 
@@ -97,17 +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);
-
+		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;
@@ -160,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
@@ -202,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

@@ -71,7 +71,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 +180,37 @@ 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();
+		}
 
 		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"
@@ -385,9 +385,21 @@
 				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\BinReader\Readers.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions="/bigobj"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<File
@@ -434,6 +446,14 @@
 			RelativePath="..\..\Common\FileDownloader\FileDownloader_win.cpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\Common\OfficeFileFormatChecker2.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\Common\3dParty\pole\pole.cpp"
+			>
+		</File>
 		<File
 			RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
 			>

ASCOfficeDocxFile2/BinReader/ChartWriter.h

@@ -38,80 +38,61 @@ namespace Writers
 {
 	class ChartWriter
 	{
-		class ChartElem
+		struct _chartElem
 		{
-		public:
-			std::wstring content;
-            std::wstring filename;
-			int index;
+			std::wstring	content;
+            std::wstring	filename;
+			int				index;
 		};
-		std::vector<ChartElem*> m_aCharts;
-        ContentTypesWriter&     m_oContentTypesWriter;
-		int nChartCount;
+		std::vector<_chartElem> m_aCharts;
 	public:
         std::wstring m_sDir;
-	public:
-        ChartWriter(std::wstring sDir, ContentTypesWriter& oContentTypesWriter):m_sDir(sDir),m_oContentTypesWriter(oContentTypesWriter)
+		int nEmbeddedCount;
+
+		ChartWriter(std::wstring sDir) : m_sDir(sDir)
 		{
-			nChartCount = 0;
+			nEmbeddedCount = 1000;
 		}
 		~ChartWriter()
 		{
-			for(size_t i = 0, length = m_aCharts.size(); i < length; ++i)
-			{
-				delete m_aCharts[i];
-			}
 		}
 		bool IsEmpty()
 		{
 			return 0 == m_aCharts.size();
 		}
-		void Write()
+		bool Write()
 		{
-			if(false == IsEmpty())
+			if(IsEmpty()) return false;
+
+			OOX::CPath pathChartDir = m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("charts");
+           
+			for(size_t i = 0; i < m_aCharts.size(); ++i)
 			{
-                OOX::CPath pathChartDir = m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("charts");
-                NSDirectory::CreateDirectory(pathChartDir.GetPath());
+				_chartElem & elem = m_aCharts[i];
 
-                for(size_t i = 0, length = m_aCharts.size(); i < length; ++i)
-				{
-					ChartElem* elem = m_aCharts[i];
+                OOX::CPath filePath = pathChartDir + FILE_SEPARATOR_STR + elem.filename;
 
-                    OOX::CPath filePath = pathChartDir + FILE_SEPARATOR_STR + elem->filename;
-
-					NSFile::CFileBinary oFile;
-					oFile.CreateFileW(filePath.GetPath());
-					oFile.WriteStringUTF8(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\r\n");
-					oFile.WriteStringUTF8(elem->content);
-					oFile.CloseFile();
-
-					//Content_Types
-                    std::wstring sRelPath = L"/word/charts/" + elem->filename;
-                    m_oContentTypesWriter.AddOverride(sRelPath, L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml");
-				}
+				NSFile::CFileBinary oFile;
+				oFile.CreateFileW(filePath.GetPath());
+				oFile.WriteStringUTF8(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\r\n");
+				oFile.WriteStringUTF8(elem.content);
+				oFile.CloseFile();
 			}
+			return true;
 		}
-		void AddChart(std::wstring& content, std::wstring& sRelsName, std::wstring& sFileName, int& index)
+		void AddChart(std::wstring& content, std::wstring& sRelsName, std::wstring& sFileName, int index)
 		{
-			ChartElem* pChartElem = new ChartElem();
-			pChartElem->content = content;
-			pChartElem->index = nChartCount + 1;
-			nChartCount++;
-            pChartElem->filename = L"chart" + std::to_wstring(pChartElem->index) + L".xml";
+			_chartElem oChartElem;
 			
-			sRelsName = L"charts/" + pChartElem->filename;
-			sFileName = pChartElem->filename;
-			index = pChartElem->index;
+			oChartElem.content	= content;
+			oChartElem.index	= index;
+            
+			oChartElem.filename = L"chart" + std::to_wstring(oChartElem.index) + L".xml";
+			
+			sRelsName	= L"charts/" + oChartElem.filename;
+			sFileName	= oChartElem.filename;
 
-			m_aCharts.push_back(pChartElem);
-		}
-		int getChartCount()
-		{
-			return nChartCount;
-		}
-		void setChartCount(int val)
-		{
-			nChartCount = val;
+			m_aCharts.push_back(oChartElem);
 		}
 	};
 }

ASCOfficeDocxFile2/BinReader/CommentsWriter.h

@@ -46,20 +46,19 @@ namespace Writers
 	class CommentsWriter
 	{
         std::wstring	m_sDir;
-		ContentTypesWriter& m_oContentTypesWriter;
 	public:
-        std::wstring m_sComment;
-        std::wstring m_sCommentExt;
-        std::wstring m_sPeople;
-	public:
-        CommentsWriter(std::wstring sDir, ContentTypesWriter& oContentTypesWriter):m_sDir(sDir),m_oContentTypesWriter(oContentTypesWriter)
+        std::wstring	m_sComment;
+        std::wstring	m_sCommentExt;
+        std::wstring	m_sPeople;
+
+		CommentsWriter(std::wstring sDir) : m_sDir(sDir)
 		{
 		}
         void setElements(std::wstring& sComment, std::wstring& sCommentExt, std::wstring& sPeople)
 		{
-			m_sComment = sComment;
-			m_sCommentExt = sCommentExt;
-			m_sPeople = sPeople;
+			m_sComment		= sComment;
+			m_sCommentExt	= sCommentExt;
+			m_sPeople		= sPeople;
 		}
 		void Write()
 		{
@@ -67,42 +66,30 @@ namespace Writers
 			{
                 OOX::CPath filePath = m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("comments.xml");
 
-				CFile oFile;
-				oFile.CreateFile(filePath.GetPath());
+				NSFile::CFileBinary oFile;
+				oFile.CreateFileW(filePath.GetPath());
 					oFile.WriteStringUTF8(g_string_comment_Start);
 					oFile.WriteStringUTF8(m_sComment);
 					oFile.WriteStringUTF8(g_string_comment_End);
 				oFile.CloseFile();
-
-				//Content_Types
-                m_oContentTypesWriter.AddOverride(std::wstring(_T("/word/comments.xml")), std::wstring(_T("application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml")));
-
-				//Rels
-				//m_oDocumentRelsWriter.AddRels(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"), _T("comments.xml"));
 			}
             if(false == m_sCommentExt.empty())
 			{
-				CFile oFile;
-                oFile.CreateFile(m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("commentsExtended.xml"));
+				NSFile::CFileBinary oFile;
+                oFile.CreateFileW(m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("commentsExtended.xml"));
 				oFile.WriteStringUTF8(g_string_commentExt_Start);
 				oFile.WriteStringUTF8(m_sCommentExt);
 				oFile.WriteStringUTF8(g_string_commentExt_End);
 				oFile.CloseFile();
-
-				//Content_Types
-                m_oContentTypesWriter.AddOverride(std::wstring(_T("/word/commentsExtended.xml")), std::wstring(_T("application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml")));
 			}
             if(false == m_sPeople.empty())
 			{
-				CFile oFile;
-                oFile.CreateFile(m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("people.xml"));
+				NSFile::CFileBinary oFile;
+                oFile.CreateFileW(m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("people.xml"));
 				oFile.WriteStringUTF8(g_string_people_Start);
 				oFile.WriteStringUTF8(m_sPeople);
 				oFile.WriteStringUTF8(g_string_people_End);
 				oFile.CloseFile();
-
-				//Content_Types
-                m_oContentTypesWriter.AddOverride(std::wstring(_T("/word/people.xml")), std::wstring(_T("application/vnd.openxmlformats-officedocument.wordprocessingml.people+xml")));
 			}
 		}
 	};

ASCOfficeDocxFile2/BinReader/ContentTypesWriter.h

@@ -1,80 +0,0 @@
-/*
- * (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
- *
- */
-#ifndef CONTENT_TYPES_WRITER
-#define CONTENT_TYPES_WRITER
-
-#include "../../XlsxSerializerCom/Common/Common.h"
-
-namespace Writers
-{
-    static std::wstring g_string_ct_Start   = L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">";
-    static std::wstring g_string_ct_Ext     = L"<Default Extension=\"bin\" ContentType=\"application/vnd.openxmlformats-officedocument.oleObject\"/><Default Extension=\"bmp\" ContentType=\"image/bmp\"/><Default Extension=\"jpg\" ContentType=\"image/jpeg\"/><Default Extension=\"jpeg\" ContentType=\"image/jpeg\"/><Default Extension=\"jpe\" ContentType=\"image/jpeg\"/><Default Extension=\"png\" ContentType=\"image/png\"/><Default Extension=\"gif\" ContentType=\"image/gif\"/><Default Extension=\"emf\" ContentType=\"image/x-emf\"/><Default Extension=\"wmf\" ContentType=\"image/x-wmf\"/><Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/><Default Extension=\"xml\" ContentType=\"application/xml\"/><Default Extension=\"xlsx\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"/>";
-    static std::wstring g_string_ct_Override = L"<Override PartName=\"/word/document.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml\"/><Override PartName=\"/word/styles.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml\"/><Override PartName=\"/word/settings.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml\"/><Override PartName=\"/word/webSettings.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml\"/><Override PartName=\"/word/fontTable.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml\"/><Override PartName=\"/word/theme/theme1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.theme+xml\"/><Override PartName=\"/docProps/core.xml\" ContentType=\"application/vnd.openxmlformats-package.core-properties+xml\"/><Override PartName=\"/docProps/app.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.extended-properties+xml\"/>";
-    static std::wstring g_string_ct_End     = L"</Types>";
-
-	class ContentTypesWriter
-	{
-		XmlUtils::CStringWriter	m_oWriter;
-        std::wstring            m_sDir;
-		XmlUtils::CStringWriter	m_oAdditional;
-	public:
-        ContentTypesWriter(std::wstring sDir) : m_sDir(sDir)
-		{
-		}
-		void Write()
-		{
-			m_oWriter.WriteString(g_string_ct_Start);
-			m_oWriter.WriteString(g_string_ct_Ext);
-			m_oWriter.WriteString(g_string_ct_Override);
-			m_oWriter.Write(m_oAdditional);
-			m_oWriter.WriteString(g_string_ct_End);
-
-            OOX::CPath filePath = m_sDir + L"/[Content_Types].xml";
-
-			CFile oFile;
-			oFile.CreateFile(filePath.GetPath());
-
-			oFile.WriteStringUTF8(m_oWriter.GetData());
-			oFile.CloseFile();
-		}
-        void AddOverride(const std::wstring& PartName, const std::wstring& ContentType)
-		{
-            std::wstring sOverride = L"<Override PartName=\"" + PartName+ L"\" ContentType=\"" + ContentType + L"\"/>";
-			m_oAdditional.WriteString(sOverride);
-		}
-        void AddOverrideRaw(const std::wstring& sXml)
-		{
-			m_oAdditional.WriteString(sXml);
-		}
-	};
-}
-#endif	// #ifndef CONTENT_TYPES_WRITER

ASCOfficeDocxFile2/BinReader/DefaultThemeWriter.h

@@ -39,15 +39,16 @@ namespace Writers
 	class DefaultThemeWriter
 	{
 	public:
-		DefaultThemeWriter()
+ 		std::wstring m_sContent;
+		
+		DefaultThemeWriter( )
 		{
 		}
         void Write(std::wstring sThemeFilePath)
 		{
-            std::wstring s_Common;
-
-			s_Common = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?> \
-<a:theme xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" name=\"Office Theme\"> \
+			if (m_sContent.empty())
+			{
+				m_sContent = _T("<a:theme xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" name=\"Office Theme\">\
   <a:themeElements> \
     <a:clrScheme name=\"Office\"> \
       <a:dk1> \
@@ -87,7 +88,7 @@ namespace Writers
         <a:srgbClr val=\"800080\"/> \
       </a:folHlink> \
     </a:clrScheme> ");
-s_Common +=
+m_sContent +=
    _T("<a:fontScheme name=\"Office\"> \
       <a:majorFont> \
         <a:latin typeface=\"Cambria\"/> \
@@ -158,7 +159,7 @@ s_Common +=
         <a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/> \
       </a:minorFont> \
     </a:fontScheme>");
-s_Common +=
+m_sContent +=
     _T("<a:fmtScheme name=\"Office\"> \
       <a:fillStyleLst> \
         <a:solidFill> \
@@ -329,13 +330,14 @@ s_Common +=
   <a:objectDefaults/> \
   <a:extraClrSchemeLst/> \
 </a:theme>");
-
+			}
 
             OOX::CPath fileName = sThemeFilePath;
 
-            CFile oFile;
-            oFile.CreateFile(fileName.GetPath());
-			oFile.WriteStringUTF8(s_Common);
+			NSFile::CFileBinary oFile;
+            oFile.CreateFileW(fileName.GetPath());
+			oFile.WriteStringUTF8(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>");
+			oFile.WriteStringUTF8(m_sContent);
 			oFile.CloseFile();
 		}
 	};

ASCOfficeDocxFile2/BinReader/DocumentRelsWriter.h

@@ -56,8 +56,8 @@ namespace Writers
 
             OOX::CPath fileName = m_sDir + FILE_SEPARATOR_STR + _T("_rels") + FILE_SEPARATOR_STR + _T(".rels");
 
-            CFile oFile;
-            oFile.CreateFile(fileName.GetPath());
+            NSFile::CFileBinary oFile;
+            oFile.CreateFileW(fileName.GetPath());
             oFile.WriteStringUTF8(s_Common);
 			oFile.CloseFile();
 		}

ASCOfficeDocxFile2/BinReader/DocumentWriter.h

@@ -40,28 +40,45 @@ 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()
 		{
             OOX::CPath filePath = m_sDir + FILE_SEPARATOR_STR + _T("word") +FILE_SEPARATOR_STR + _T("document.xml");
 
-			CFile oFile;
-			oFile.CreateFile(filePath.GetPath());			
+			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());
 
                 oFile.WriteStringUTF8( std::wstring(_T("<w:body>")));
                     oFile.WriteStringUTF8(m_oContent.GetData());
 
-                    oFile.WriteStringUTF8( std::wstring(_T("<w:sectPr >")));
+                    oFile.WriteStringUTF8( std::wstring(_T("<w:sectPr>")));
                         oFile.WriteStringUTF8(WriteSectPrHdrFtr());
                         oFile.WriteStringUTF8(m_oSecPr.GetData());
                     oFile.WriteStringUTF8( std::wstring(_T("</w:sectPr>")));

ASCOfficeDocxFile2/BinReader/FileWriter.h

@@ -32,6 +32,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"
 #include "HeaderFooterWriter.h"
@@ -45,19 +48,21 @@
 #include "webSettingsWriter.h"
 #include "DefaultThemeWriter.h"
 
-namespace BinDocxRW {
+namespace BinDocxRW 
+{
 	class CComments;
 }
+
+namespace NSBinPptxRW
+{
+	class CDrawingConverter;
+}
+
 namespace Writers
 {
 	class FileWriter
 	{
-	public:
-		NSBinPptxRW::CDrawingConverter* m_pDrawingConverter;
-        std::wstring m_sThemePath;
-		bool m_bSaveChartAsImg;
-		
-		ContentTypesWriter		m_oContentTypesWriter;
+	public:		
 		FontTableWriter			m_oFontTableWriter;
 		DocumentWriter			m_oDocumentWriter;
 		MediaWriter				m_oMediaWriter;
@@ -71,35 +76,59 @@ namespace Writers
 		ChartWriter				m_oChartWriter;
 		DocumentRelsWriter		m_oDocumentRelsWriter;
 		WebSettingsWriter		m_oWebSettingsWriter;
-		DefaultThemeWriter		m_oDefaultTheme;
+		DefaultThemeWriter		m_oTheme;
 		
-		int m_nDocPrIndex;
-		BinDocxRW::CComments* m_pComments;
-	public:
-        FileWriter(std::wstring sDirOutput,std::wstring sFontDir, bool bNoFontDir, int nVersion, bool bSaveChartAsImg, NSBinPptxRW::CDrawingConverter* pDrawingConverter, std::wstring sThemePath):
-										m_pDrawingConverter(pDrawingConverter),m_sThemePath(sThemePath),m_bSaveChartAsImg(bSaveChartAsImg),
-										m_oContentTypesWriter(sDirOutput), m_oFontTableWriter(sDirOutput, sFontDir, bNoFontDir),
-										m_oHeaderFooterWriter(sDirOutput, m_oContentTypesWriter),
-										m_oFootnotesWriter(sDirOutput, m_oContentTypesWriter),
-										m_oEndnotesWriter(sDirOutput, m_oContentTypesWriter),
-										m_oMediaWriter(sDirOutput),
-										m_oStylesWriter(sDirOutput, nVersion),
-										m_oNumberingWriter(sDirOutput, m_oContentTypesWriter),
-										m_oDocumentWriter(sDirOutput, m_oHeaderFooterWriter),
-										m_oSettingWriter(sDirOutput, m_oHeaderFooterWriter),
-										m_oCommentsWriter(sDirOutput, m_oContentTypesWriter),
-										m_oChartWriter(sDirOutput, m_oContentTypesWriter),
-										m_oDocumentRelsWriter(sDirOutput),
-										m_oWebSettingsWriter(sDirOutput),
+		smart_ptr<OOX::VbaProject>		m_pVbaProject;
+	
+ 		NSBinPptxRW::CDrawingConverter* m_pDrawingConverter;
+		bool							m_bSaveChartAsImg;
+		std::wstring					m_sThemePath;
+		int								m_nDocPrIndex;
+		BinDocxRW::CComments*			m_pComments;
+
+		FileWriter (std::wstring sDirOutput,std::wstring sFontDir, bool bNoFontDir, int nVersion, bool bSaveChartAsImg, NSBinPptxRW::CDrawingConverter* pDrawingConverter, std::wstring sThemePath)
+									:	m_pDrawingConverter(pDrawingConverter), m_sThemePath(sThemePath), m_bSaveChartAsImg(bSaveChartAsImg),
+										m_oFontTableWriter		(sDirOutput, sFontDir, bNoFontDir),
+										m_oHeaderFooterWriter	(sDirOutput),
+										m_oFootnotesWriter		(sDirOutput),
+										m_oEndnotesWriter		(sDirOutput),
+										m_oMediaWriter			(sDirOutput),
+										m_oStylesWriter			(sDirOutput, nVersion),
+										m_oNumberingWriter		(sDirOutput),
+										m_oDocumentWriter		(sDirOutput, m_oHeaderFooterWriter),
+										m_oSettingWriter		(sDirOutput, m_oHeaderFooterWriter),
+										m_oCommentsWriter		(sDirOutput),
+										m_oChartWriter			(sDirOutput),
+										m_oDocumentRelsWriter	(sDirOutput),
+										m_oWebSettingsWriter	(sDirOutput),
 										m_nDocPrIndex(0),
 										m_pComments(NULL)
 		{
 		}
-	public: int getNextDocPr()
-			{
-				m_nDocPrIndex++;
-				return m_nDocPrIndex;
-			}
+		int getNextDocPr()
+		{
+			m_nDocPrIndex++;
+			return m_nDocPrIndex;
+		}
+
+		void Write()
+		{
+			m_oCommentsWriter.Write();
+			m_oChartWriter.Write();
+			m_oStylesWriter.Write();
+			m_oNumberingWriter.Write();
+			m_oFontTableWriter.Write();
+			m_oHeaderFooterWriter.Write();
+			m_oFootnotesWriter.Write();
+			m_oEndnotesWriter.Write();
+	//Setting пишем после HeaderFooter, чтобы заполнить evenAndOddHeaders
+			m_oSettingWriter.Write();
+			m_oWebSettingsWriter.Write();
+	//Document пишем после HeaderFooter, чтобы заполнить sectPr
+			m_oDocumentWriter.Write();
+	//Rels и ContentTypes пишем в конце
+			m_oDocumentRelsWriter.Write();
+		}
 	};
 }
 #endif	// #ifndef FILE_WRITER

ASCOfficeDocxFile2/BinReader/HeaderFooterWriter.h

@@ -33,6 +33,7 @@
 #define HEADER_FOOTER_WRITER
 
 #include "../../XlsxSerializerCom/Common/Common.h"
+#include "../../Common/DocxFormat/Source/Common/SimpleTypes_Word.h"
 
 namespace Writers
 {
@@ -54,32 +55,65 @@ namespace Writers
 		{
             return m_sFilename.empty();
 		}
-        std::wstring m_sFilename;
-		ContentWriter Header;
-        std::wstring rId;
-		SimpleTypes::EHdrFtr eType;
+        std::wstring			m_sFilename;
+		ContentWriter			Header;
+        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 
 	{
          std::wstring	m_sDir;
-		ContentTypesWriter& m_oContentTypesWriter;
 	public:
 		std::vector<HdrFtrItem*> m_aHeaders;
 		std::vector<HdrFtrItem*> m_aFooters;
-	public:
-        HeaderFooterWriter( std::wstring sDir, ContentTypesWriter& oContentTypesWriter) : m_sDir(sDir),m_oContentTypesWriter(oContentTypesWriter)
+
+		HeaderFooterWriter( std::wstring sDir) : m_sDir(sDir) 
 		{
 		}
 		~HeaderFooterWriter()
@@ -109,8 +143,8 @@ namespace Writers
 		{
             OOX::CPath filePath = m_sDir + FILE_SEPARATOR_STR +_T("word") + FILE_SEPARATOR_STR + sFilename;
 
-			CFile oFile;
-			oFile.CreateFile(filePath.GetPath());
+			NSFile::CFileBinary oFile;
+			oFile.CreateFileW(filePath.GetPath());
 
 			if(bHeader)
 				oFile.WriteStringUTF8(g_string_hdr_Start);
@@ -122,43 +156,33 @@ namespace Writers
 			else
 				oFile.WriteStringUTF8(g_string_ftr_End);
 			oFile.CloseFile();
-
-			//Content_Types
-			m_oContentTypesWriter.AddOverride(L"/word/" + sFilename, L"application/vnd.openxmlformats-officedocument.wordprocessingml." + sHeader + L"+xml");
-
-			//Rels
-			//return m_oDocumentRelsWriter.AddRels(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/") + sHeader, sFilename);
 		}
 	};
 	class FootnotesWriter
 	{
          std::wstring m_sDir;
-		ContentTypesWriter& m_oContentTypesWriter;
 	public:
 		ContentWriter	m_oNotesWriter;
-        FootnotesWriter( std::wstring sDir, ContentTypesWriter& oContentTypesWriter):m_sDir(sDir),m_oContentTypesWriter(oContentTypesWriter)
+
+        FootnotesWriter( std::wstring sDir ):m_sDir(sDir)
 		{
 		}
 		void Write()
 		{
-			if(!IsEmpty())
-			{
-                 std::wstring sFilename = getFilename();
+			if(IsEmpty()) return;
 
-                 std::wstring filePath = m_sDir + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + sFilename;
+			std::wstring sFilename = getFilename();
 
-				CFile oFile;
-				oFile.CreateFile(filePath);
-				oFile.WriteStringUTF8(g_string_footnotes_Start);
-				oFile.WriteStringUTF8(m_oNotesWriter.m_oContent.GetData());
-				oFile.WriteStringUTF8(g_string_footnotes_End);
-				oFile.CloseFile();
+             std::wstring filePath = m_sDir + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + sFilename;
 
-				//ContentType
-				m_oContentTypesWriter.AddOverride(L"/word/" + sFilename, L"application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml");
-			}
+			NSFile::CFileBinary oFile;
+			oFile.CreateFileW (filePath);
+			oFile.WriteStringUTF8 (g_string_footnotes_Start);
+			oFile.WriteStringUTF8 (m_oNotesWriter.m_oContent.GetData());
+			oFile.WriteStringUTF8 (g_string_footnotes_End);
+			oFile.CloseFile();
 		}
-         std::wstring getFilename()
+		std::wstring getFilename()
 		{
 			return _T("footnotes.xml");
 		}
@@ -169,33 +193,29 @@ namespace Writers
 	};
 	class EndnotesWriter
 	{
-         std::wstring m_sDir;
-		ContentTypesWriter& m_oContentTypesWriter;
+		std::wstring m_sDir;
 	public:
 		ContentWriter	m_oNotesWriter;
-        EndnotesWriter( std::wstring sDir, ContentTypesWriter& oContentTypesWriter):m_sDir(sDir),m_oContentTypesWriter(oContentTypesWriter)
+
+        EndnotesWriter( std::wstring sDir ) : m_sDir(sDir) 
 		{
 		}
 		void Write()
 		{
-			if(!IsEmpty())
-			{
-                 std::wstring sFilename = getFilename();
+			if(IsEmpty()) return;
 
-                 std::wstring filePath = m_sDir + FILE_SEPARATOR_STR +_T("word") + FILE_SEPARATOR_STR + sFilename;
+			std::wstring sFilename = getFilename();
 
-				CFile oFile;
-				oFile.CreateFile(filePath);
-				oFile.WriteStringUTF8(g_string_endnotes_Start);
-				oFile.WriteStringUTF8(m_oNotesWriter.m_oContent.GetData());
-				oFile.WriteStringUTF8(g_string_endnotes_End);
-				oFile.CloseFile();
+             std::wstring filePath = m_sDir + FILE_SEPARATOR_STR +_T("word") + FILE_SEPARATOR_STR + sFilename;
 
-				//ContentType
-				m_oContentTypesWriter.AddOverride(_T("/word/") + sFilename, _T("application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"));
-			}
+			NSFile::CFileBinary oFile;
+			oFile.CreateFileW(filePath);
+			oFile.WriteStringUTF8(g_string_endnotes_Start);
+			oFile.WriteStringUTF8(m_oNotesWriter.m_oContent.GetData());
+			oFile.WriteStringUTF8(g_string_endnotes_End);
+			oFile.CloseFile();
 		}
-         std::wstring getFilename()
+		std::wstring getFilename()
 		{
 			return _T("endnotes.xml");
 		}

ASCOfficeDocxFile2/BinReader/NumberingWriter.h

@@ -32,7 +32,6 @@
 #ifndef NUMBERING_WRITER
 #define NUMBERING_WRITER
 
-#include "ContentTypesWriter.h"
 #include "DocumentRelsWriter.h"
 
 namespace Writers
@@ -43,13 +42,12 @@ namespace Writers
 	class NumberingWriter
 	{
 		XmlUtils::CStringWriter	m_oWriter;
-         std::wstring	m_sDir;
-		ContentTypesWriter& m_oContentTypesWriter;
+		std::wstring			m_sDir;
 	public:
 		XmlUtils::CStringWriter	m_oANum;
 		XmlUtils::CStringWriter	m_oNumList;
-	public:
-        NumberingWriter( std::wstring sDir, ContentTypesWriter& oContentTypesWriter):m_sDir(sDir),m_oContentTypesWriter(oContentTypesWriter)
+
+		NumberingWriter( std::wstring sDir) : m_sDir(sDir)
 		{
 		}
 		bool IsEmpty()
@@ -58,26 +56,20 @@ namespace Writers
 		}
 		void Write()
 		{
-			if(false == IsEmpty())
-			{
-				m_oWriter.WriteString(g_string_n_Start);
-				m_oWriter.Write(m_oANum);
-				m_oWriter.Write(m_oNumList);
-				m_oWriter.WriteString(g_string_n_End);
+			if(IsEmpty()) return;
 
-                OOX::CPath filePath = m_sDir + FILE_SEPARATOR_STR +_T("word") + FILE_SEPARATOR_STR + _T("numbering.xml");
+			m_oWriter.WriteString(g_string_n_Start);
+			m_oWriter.Write(m_oANum);
+			m_oWriter.Write(m_oNumList);
+			m_oWriter.WriteString(g_string_n_End);
 
-				CFile oFile;
-				oFile.CreateFile(filePath.GetPath());
+            OOX::CPath filePath = m_sDir + FILE_SEPARATOR_STR +_T("word") + FILE_SEPARATOR_STR + _T("numbering.xml");
 
-				oFile.WriteStringUTF8(m_oWriter.GetData());
-				oFile.CloseFile();
+			NSFile::CFileBinary oFile;
+			oFile.CreateFileW(filePath.GetPath());
 
-				//ContentType
-                m_oContentTypesWriter.AddOverride( std::wstring(_T("/word/numbering.xml")),  std::wstring(_T("application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml")));
-				//Rels
-				//m_oDocumentRelsWriter.AddRels(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"), _T("numbering.xml"));
-			}
+			oFile.WriteStringUTF8(m_oWriter.GetData());
+			oFile.CloseFile();
 		}
 	};
 }

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -34,6 +34,8 @@
 
 #include "../../Common/DocxFormat/Source/XML/Utils.h"
 
+#include <boost/algorithm/string.hpp>
+
 namespace BinDocxRW {
 
 class SectPr
@@ -353,10 +355,13 @@ class Tab
 public:
 	BYTE Val;
 	double Pos;
+	BYTE Leader;
+	bool bLeader;
 	Tab()
 	{
 		Val = shd_Nil;
 		Pos = 0;
+		bLeader = false;
 	}
 };
 class Tabs
@@ -367,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;
@@ -403,6 +408,8 @@ public:
     std::wstring Fill;
     std::wstring Del;
     std::wstring Ins;
+	std::wstring MoveFrom;
+	std::wstring MoveTo;
     std::wstring rPrChange;
 
 	bool bBold;
@@ -438,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();
 
@@ -490,13 +497,15 @@ public:
         Fill.clear();
         Del.clear();
         Ins.clear();
+		MoveFrom.clear();
+		MoveTo.clear();
         rPrChange.clear();
 	}
 	bool IsNoEmpty()
 	{
 		return bBold || bItalic || bUnderline || bStrikeout || bFontAscii || bFontHAnsi || bFontAE || bFontCS || bFontSize || bColor || bVertAlign || bHighLight || bShd ||
 			bRStyle || bSpacing || bDStrikeout || bCaps || bSmallCaps || bPosition || bFontHint || bBoldCs || bItalicCs || bFontSizeCs || bCs || bRtl || bLang || bLangBidi || bLangEA || bThemeColor || bVanish ||
-            !Outline.empty() || !Fill.empty() || !Del.empty() || !Ins.empty() || !rPrChange.empty();
+			!Outline.empty() || !Fill.empty() || !Del.empty() || !Ins.empty() || !MoveFrom.empty() || !MoveTo.empty() || !rPrChange.empty();
 	}
 	void Write(XmlUtils::CStringWriter*  pCStringWriter)
 	{
@@ -747,6 +756,10 @@ public:
 			pCStringWriter->WriteString(Del);
         if (!Ins.empty())
 			pCStringWriter->WriteString(Ins);
+		if (!MoveFrom.empty())
+			pCStringWriter->WriteString(MoveFrom);
+		if (!MoveTo.empty())
+			pCStringWriter->WriteString(MoveTo);
         if (!rPrChange.empty())
 			pCStringWriter->WriteString(rPrChange);
         pCStringWriter->WriteString(L"</w:rPr>");
@@ -1573,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;
@@ -1686,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];
             }
@@ -1696,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);
@@ -1715,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)
@@ -1766,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;
@@ -1777,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;
 		}
@@ -1801,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;
@@ -1813,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));
 		}
@@ -1822,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));
 		}
@@ -1831,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));
 		}
@@ -1881,7 +1902,12 @@ public:
 class CDrawingProperty
 {
 public:
-    long    DataPos;
+	bool			bObject;
+    std::wstring	sObjectProgram;	
+    long			nObjectId;
+    BYTE			nObjectType;
+	
+	long    DataPos;
     long    DataLength;
     BYTE    Type;
     bool    BehindDoc;
@@ -1914,8 +1940,8 @@ public:
     int     m_nDocPr;
     std::wstring sGraphicFramePr;
     std::wstring sDocPr;
-
-    CDrawingPropertyWrap DrawingPropertyWrap;
+   
+	CDrawingPropertyWrap DrawingPropertyWrap;
 
     bool bDataPos;
 	bool bDataLength;
@@ -1949,6 +1975,10 @@ public:
     CDrawingProperty(int nDocPr)
 	{
         m_nDocPr    = nDocPr;
+
+		bObject		= false;
+		nObjectType	= 0;
+		nObjectId	= 0;
         bDataPos    = false;
 		bDataLength = false;
         bType       = false;
@@ -2062,7 +2092,7 @@ distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"" + std::to_wstr
                 int nSimplePos = 0;
                 if(bBSimplePos && BSimplePos)
                     nSimplePos = 1;
-                int nRelativeHeight = 0;
+                unsigned long nRelativeHeight = 0;
                 if(bRelativeHeight)
                     nRelativeHeight = RelativeHeight;
                 int nBehindDoc = 0;
@@ -2310,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>";
@@ -2334,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())
@@ -2728,7 +2753,7 @@ public:
 				}
 				if(NULL != tblPr)
 				{
-					pCStringWriter->WriteString(tblPr->Write(false, true));
+					pCStringWriter->WriteString(tblPr->Write());
 				}
                 if(NULL != tblGridChange)
                 {

ASCOfficeDocxFile2/BinReader/Readers.cpp

@@ -0,0 +1,121 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#include "Readers.h"
+
+
+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)
+{
+}
+int Binary_HdrFtrTableReader::Read()
+{
+	return ReadTable(&Binary_HdrFtrTableReader::ReadHdrFtrContent, this);
+}
+int Binary_HdrFtrTableReader::ReadHdrFtrContent(BYTE type, long length, void* poResult)
+{
+	int res = c_oSerConstants::ReadOk;
+	if ( c_oSerHdrFtrTypes::Header == type || c_oSerHdrFtrTypes::Footer == type )
+	{
+		nCurType = type;
+		res = Read1(length, &Binary_HdrFtrTableReader::ReadHdrFtrFEO, this, poResult);
+	}
+	else
+		res = c_oSerConstants::ReadUnknown;
+	return res;
+}
+int Binary_HdrFtrTableReader::ReadHdrFtrFEO(BYTE type, long length, void* poResult)
+{
+	int res = c_oSerConstants::ReadOk;
+	if ( c_oSerHdrFtrTypes::HdrFtr_First == type || c_oSerHdrFtrTypes::HdrFtr_Even == type || c_oSerHdrFtrTypes::HdrFtr_Odd == type )
+	{
+		nCurHeaderType = type;
+		res = Read1(length, &Binary_HdrFtrTableReader::ReadHdrFtrItem, this, poResult);
+	}
+	else
+		res = c_oSerConstants::ReadUnknown;
+	return res;
+}
+int Binary_HdrFtrTableReader::ReadHdrFtrItem(BYTE type, long length, void* poResult)
+{
+	int res = c_oSerConstants::ReadOk;
+	if ( c_oSerHdrFtrTypes::HdrFtr_Content == type )
+	{
+		Writers::HdrFtrItem* poHdrFtrItem = NULL;
+		switch(nCurHeaderType)
+		{
+		case c_oSerHdrFtrTypes::HdrFtr_First:poHdrFtrItem = new Writers::HdrFtrItem(SimpleTypes::hdrftrFirst);break;
+		case c_oSerHdrFtrTypes::HdrFtr_Even:poHdrFtrItem = new Writers::HdrFtrItem(SimpleTypes::hdrftrEven);break;
+		case c_oSerHdrFtrTypes::HdrFtr_Odd:poHdrFtrItem = new Writers::HdrFtrItem(SimpleTypes::hdrftrDefault);break;
+		}
+		if(NULL != poHdrFtrItem)
+		{
+			if(nCurType == c_oSerHdrFtrTypes::Header)
+			{
+				m_oHeaderFooterWriter.m_aHeaders.push_back(poHdrFtrItem);
+                poHdrFtrItem->m_sFilename = L"header" + std::to_wstring((int)m_oHeaderFooterWriter.m_aHeaders.size()) + L".xml";
+			}
+			else
+			{
+				m_oHeaderFooterWriter.m_aFooters.push_back(poHdrFtrItem);
+                poHdrFtrItem->m_sFilename = L"footer" + std::to_wstring((int)m_oHeaderFooterWriter.m_aFooters.size()) + L".xml";
+			}
+			m_oFileWriter.m_pDrawingConverter->SetDstContentRels();
+			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 + L"word" + 
+																				FILE_SEPARATOR_STR + L"_rels"+ 
+																				FILE_SEPARATOR_STR + poHdrFtrItem->m_sFilename + L".rels";
+
+            m_oFileWriter.m_pDrawingConverter->SaveDstContentRels(fileRelsPath.GetPath());
+		}
+	}
+	else
+		res = c_oSerConstants::ReadUnknown;
+	return res;
+}
+int Binary_HdrFtrTableReader::ReadHdrFtrItemContent(BYTE type, long length, void* poResult)
+{
+	Binary_DocumentTableReader* pBinary_DocumentTableReader = static_cast<Binary_DocumentTableReader*>(poResult);
+	return pBinary_DocumentTableReader->ReadDocumentContent(type, length, NULL);
+}
+
+}

ASCOfficeDocxFile2/BinReader/SettingWriter.h

@@ -42,9 +42,9 @@ namespace Writers
 
 	class SettingWriter
 	{
-        std::wstring m_sDir;
-		XmlUtils::CStringWriter	m_oSettingWriter;
-		HeaderFooterWriter& m_oHeaderFooterWriter;
+        std::wstring				m_sDir;
+		XmlUtils::CStringWriter		m_oSettingWriter;
+		HeaderFooterWriter&			m_oHeaderFooterWriter;
 	public:
         SettingWriter(std::wstring sDir, HeaderFooterWriter& oHeaderFooterWriter):m_sDir(sDir),m_oHeaderFooterWriter(oHeaderFooterWriter)
 		{
@@ -54,8 +54,8 @@ namespace Writers
 			Prepare();
             OOX::CPath filePath = m_sDir + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"settings.xml";
 
-			CFile oFile;
-			oFile.CreateFile(filePath.GetPath());
+			NSFile::CFileBinary oFile;
+			oFile.CreateFileW(filePath.GetPath());
 			oFile.WriteStringUTF8(g_string_set_Start);
 			oFile.WriteStringUTF8(m_oSettingWriter.GetData());
 			oFile.WriteStringUTF8(g_string_set_Default);

ASCOfficeDocxFile2/BinReader/StylesWriter.h

@@ -58,7 +58,6 @@ namespace Writers
 		}
 		void Write()
 		{
-
 			m_oWriter.WriteString(g_string_st_Start);
             m_oWriter.WriteString(std::wstring(_T("<w:docDefaults>")));
             m_oWriter.WriteString(std::wstring(_T("<w:rPrDefault>")));
@@ -81,8 +80,8 @@ namespace Writers
 
             OOX::CPath filePath = m_sDir + FILE_SEPARATOR_STR +_T("word") + FILE_SEPARATOR_STR + _T("styles.xml");
 
-			CFile oFile;
-			oFile.CreateFile(filePath.GetPath());
+			NSFile::CFileBinary oFile;
+			oFile.CreateFileW(filePath.GetPath());
 
 			oFile.WriteStringUTF8(m_oWriter.GetData());
 			oFile.CloseFile();

ASCOfficeDocxFile2/BinReader/fontTableWriter.h

@@ -34,6 +34,8 @@
 
 #include "../../XlsxSerializerCom/Common/Common.h"
 #include "../../DesktopEditor/fontengine/FontManager.h"
+#include "../../DesktopEditor/fontengine/ApplicationFonts.h"
+#include <boost/unordered_map.hpp>
 
 namespace Writers
 {
@@ -47,9 +49,9 @@ namespace Writers
         CApplicationFonts       m_oApplicationFonts;
         CFontManager*           m_pFontManager;
 	public:
-        std::map<std::wstring, int> m_mapFonts;
-	public:
-        FontTableWriter(std::wstring sDir, std::wstring sFontDir, bool bNoFontDir):m_sDir(sDir)
+        boost::unordered_map<std::wstring, int> m_mapFonts;
+
+		FontTableWriter(std::wstring sDir, std::wstring sFontDir, bool bNoFontDir):m_sDir(sDir)
 		{
 			m_pFontManager = NULL;
 			if(!bNoFontDir)
@@ -80,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)
@@ -102,8 +104,8 @@ namespace Writers
 
             OOX::CPath filePath = m_sDir + FILE_SEPARATOR_STR +_T("word") + FILE_SEPARATOR_STR + _T("fontTable.xml");
 
-			CFile oFile;
-			oFile.CreateFile(filePath.GetPath());
+			NSFile::CFileBinary oFile;
+			oFile.CreateFileW(filePath.GetPath());
 
 			oFile.WriteStringUTF8(m_oWriter.GetData());
 			oFile.CloseFile();

ASCOfficeDocxFile2/BinReader/webSettingsWriter.h

@@ -54,8 +54,8 @@ namespace Writers
 
             OOX::CPath fileName = m_sDir + FILE_SEPARATOR_STR +_T("word") + FILE_SEPARATOR_STR + _T("webSettings.xml");
 
-            CFile oFile;
-            oFile.CreateFile(fileName.GetPath());
+            NSFile::CFileBinary oFile;
+            oFile.CreateFileW(fileName.GetPath());
             oFile.WriteStringUTF8(s_Common);
 			oFile.CloseFile();
 		}

ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h

@@ -33,13 +33,11 @@
 #define BINEQUATIONWRITER_H
 
 #include "BinReaderWriterDefines.h"
+
+#include "../../Common/DocxFormat/Source/Common/SimpleTypes_OMath.h"
 #include "../../Common/DocxFormat/Source/MathEquation/OutputDev.h"
 #include <stack>
 
-/*namespace BinDocxRW
-{
-	class BinaryCommonWriter;
-}*/
 namespace MathEquation
 {
 	class EquationRun
@@ -146,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);
@@ -559,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);
 
@@ -616,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();
@@ -1677,7 +1679,7 @@ namespace MathEquation
 
 			void WriteEndNode(BinaryEquationWriter* pWriter)
 			{
-				int nCurPos;
+				int nCurPos = -1;
 				if (!m_aBaseStack.empty())
 				{
 					nCurPos = m_aBaseStack.top();
@@ -1689,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
 	{
@@ -381,7 +385,9 @@ extern int g_nCurFormatVersion;
 		TextFill = 32,
 		Del = 33,
 		Ins = 34,
-		rPrChange = 35
+		rPrChange = 35,
+		MoveFrom = 36,
+		MoveTo = 37
 	};}
 	namespace c_oSerProp_rowPrType{enum c_oSerProp_rowPrType
 	{
@@ -463,7 +469,18 @@ extern int g_nCurFormatVersion;
 		FldSimple		= 11,
 		Del				= 12,
 		Ins				= 13,
-		Background		= 14
+		Background		= 14,
+		Sdt				= 15,
+		MoveFrom		= 16,
+		MoveTo			= 17,
+		MoveFromRangeStart = 18,
+		MoveFromRangeEnd = 19,
+		MoveToRangeStart = 20,
+		MoveToRangeEnd = 21,
+		JsaProject = 22,
+		BookmarkStart = 23,
+		BookmarkEnd = 24
+
 	};}
 	namespace c_oSerDocTableType{enum c_oSerDocTableType
 	{
@@ -477,7 +494,10 @@ extern int g_nCurFormatVersion;
 		Cell =  6,
 		Cell_Pr =  7,
 		Cell_Content =  8,
-		tblGridChange = 9
+		tblGridChange = 9,
+		Sdt = 10,
+		BookmarkStart = 11,
+		BookmarkEnd = 12
 	};}
 	namespace c_oSerRunType{enum c_oSerRunType
 	{
@@ -490,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,
@@ -508,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
 	{
@@ -705,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
 	{
@@ -878,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
 	{		
@@ -910,7 +940,9 @@ extern int g_nCurFormatVersion;
 	namespace c_oSer_FldSimpleType{ enum c_oSer_FldSimpleType
 	{
 		Content = 0,
-		Instr = 1
+		Instr = 1,
+		FFData = 2,
+		CharType = 3
 	};}
 	namespace c_oSer_ColorThemeType{ enum c_oSer_ColorThemeType
 	{
@@ -997,6 +1029,98 @@ extern int g_nCurFormatVersion;
 		Title	= 3,
 		Descr = 4
 	};}
+	namespace c_oSerEmbedded{enum c_oSerEmbedded
+	{
+		Type = 0,
+		Data = 1,
+		Program = 2
+	};}
+	namespace c_oSerSdt{enum c_oSerSdt
+	{
+		Pr = 0,
+		EndPr = 1,
+		Content = 2,
+		Type = 3,
+		Alias = 4,
+		ComboBox = 5,
+		LastValue = 6,
+		SdtListItem = 7,
+		DisplayText = 8,
+		Value = 9,
+		DataBinding = 10,
+		PrefixMappings = 11,
+		StoreItemID = 12,
+		XPath = 13,
+		PrDate = 14,
+		FullDate = 15,
+		Calendar = 16,
+		DateFormat = 17,
+		Lid = 18,
+		StoreMappedDataAs = 19,
+		DocPartList = 20,
+		DocPartObj = 21,
+		DocPartCategory = 22,
+		DocPartGallery = 23,
+		DocPartUnique = 24,
+		DropDownList = 25,
+		Id = 26,
+		Label = 27,
+		Lock = 28,
+		PlaceHolder = 29,
+		RPr = 30,
+		ShowingPlcHdr = 31,
+		TabIndex = 32,
+		Tag = 33,
+		Temporary = 34,
+		MultiLine = 35
+	};}
+	namespace c_oSerFFData{enum c_oSerFFData
+	{
+		CalcOnExit = 0,
+		CheckBox = 1,
+		DDList = 2,
+		Enabled = 3,
+		EntryMacro = 4,
+		ExitMacro = 5,
+		HelpText = 6,
+		Label = 7,
+		Name = 8,
+		StatusText = 9,
+		TabIndex = 10,
+		TextInput = 11,
+		CBChecked = 12,
+		CBDefault = 13,
+		CBSize = 14,
+		CBSizeAuto = 15,
+		DLDefault = 16,
+		DLResult = 17,
+		DLListEntry = 18,
+		HTType = 19,
+		HTVal = 20,
+		TIDefault = 21,
+		TIFormat = 22,
+		TIMaxLength = 23,
+		TIType = 24,
+	};}
+	namespace c_oSerMoveRange{enum c_oSerMoveRange
+	{
+		Author = 0,
+		ColFirst = 1,
+		ColLast = 2,
+		Date = 3,
+		DisplacedByCustomXml = 4,
+		Id = 5,
+		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/BinWriter/BinWriters.cpp

@@ -35,9 +35,9 @@
 namespace BinDocxRW
 {
 	BinaryHeaderFooterTableWriter::BinaryHeaderFooterTableWriter(ParamsWriter& oParamsWriter, OOX::IFileContainer* oDocumentRels, std::map<int, bool>* mapIgnoreComments):
-	m_oBcw(oParamsWriter), m_oParamsWriter(oParamsWriter), m_poTheme(oParamsWriter.m_poTheme), m_oFontProcessor(*oParamsWriter.m_pFontProcessor), m_oSettings(oParamsWriter.m_oSettings),m_pOfficeDrawingConverter(oParamsWriter.m_pOfficeDrawingConverter), m_oDocumentRels(oDocumentRels),m_mapIgnoreComments(mapIgnoreComments)
+	m_oBcw(oParamsWriter), m_oParamsWriter(oParamsWriter), m_poTheme(oParamsWriter.m_poTheme), m_oFontProcessor(*oParamsWriter.m_pFontProcessor), m_oSettings(oParamsWriter.m_oSettings), m_pOfficeDrawingConverter(oParamsWriter.m_pOfficeDrawingConverter), m_oDocumentRels(oDocumentRels),m_mapIgnoreComments(mapIgnoreComments)
 	{
-	};
+	}
 	void BinaryHeaderFooterTableWriter::Write()
 	{
 		int nStart = m_oBcw.WriteItemWithLengthStart();
@@ -57,7 +57,7 @@ namespace BinDocxRW
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
 		m_oBcw.WriteItemWithLengthEnd(nStart);
-	};
+	}
 	void BinaryHeaderFooterTableWriter::WriteHdrFtrContent(std::vector<OOX::CHdrFtr*>& aHdrFtrs, std::vector<SimpleTypes::EHdrFtr>& aHdrFtrTypes, std::vector<OOX::Logic::CSectionProperty*>& aHdrSectPrs, bool bHdr)
 	{
 		int nCurPos = 0;
@@ -69,26 +69,28 @@ namespace BinDocxRW
 			BYTE byteHdrFtrType = c_oSerHdrFtrTypes::HdrFtr_Odd;
 			switch(eType)
 			{
-			case SimpleTypes::hdrftrFirst: byteHdrFtrType = c_oSerHdrFtrTypes::HdrFtr_First;break;
-			case SimpleTypes::hdrftrEven: byteHdrFtrType = c_oSerHdrFtrTypes::HdrFtr_Even;break;
-			default: byteHdrFtrType = c_oSerHdrFtrTypes::HdrFtr_Odd;break;
+				case SimpleTypes::hdrftrFirst:	byteHdrFtrType = c_oSerHdrFtrTypes::HdrFtr_First;	break;
+				case SimpleTypes::hdrftrEven:	byteHdrFtrType = c_oSerHdrFtrTypes::HdrFtr_Even;	break;
+				default:						byteHdrFtrType = c_oSerHdrFtrTypes::HdrFtr_Odd;		break;
 			}
 			nCurPos = m_oBcw.WriteItemStart(byteHdrFtrType);
 			WriteHdrFtrItem(pSectPr, pHdrFtr, bHdr);
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
-	};
+	}
 	void BinaryHeaderFooterTableWriter::WriteHdrFtrItem(OOX::Logic::CSectionProperty* pSectPr, OOX::CHdrFtr* pHdrFtr, bool bHdr)
-		{
-			int nCurPos = 0;
-			//Content
-			ParamsDocumentWriter oParamsDocumentWriter(pHdrFtr, pHdrFtr->m_oReadPath.GetPath());
-			m_oParamsWriter.m_pCurRels = oParamsDocumentWriter.m_pRels;
-			m_oParamsWriter.m_sCurDocumentPath = oParamsDocumentWriter.m_sDocumentPath;
-			BinaryDocumentTableWriter oBinaryDocumentTableWriter(m_oParamsWriter, oParamsDocumentWriter, m_mapIgnoreComments, NULL);
-			oBinaryDocumentTableWriter.prepareOfficeDrawingConverter(m_pOfficeDrawingConverter, oParamsDocumentWriter.m_sDocumentPath,  pHdrFtr->m_arrShapeTypes);
-			nCurPos = m_oBcw.WriteItemStart(c_oSerHdrFtrTypes::HdrFtr_Content);
-			oBinaryDocumentTableWriter.WriteDocumentContent(pHdrFtr->m_arrItems);
-			m_oBcw.WriteItemEnd(nCurPos);
-		};
+	{
+		int nCurPos = 0;
+	//Content
+		ParamsDocumentWriter oParamsDocumentWriter(pHdrFtr);
+		m_oParamsWriter.m_pCurRels = oParamsDocumentWriter.m_pRels;
+
+		BinaryDocumentTableWriter oBinaryDocumentTableWriter(m_oParamsWriter, oParamsDocumentWriter, m_mapIgnoreComments, NULL);
+		
+		oBinaryDocumentTableWriter.prepareOfficeDrawingConverter(m_pOfficeDrawingConverter, oParamsDocumentWriter.m_pRels,  pHdrFtr->m_arrShapeTypes);
+		
+		nCurPos = m_oBcw.WriteItemStart(c_oSerHdrFtrTypes::HdrFtr_Content);
+		oBinaryDocumentTableWriter.WriteDocumentContent(pHdrFtr->m_arrItems);
+		m_oBcw.WriteItemEnd(nCurPos);
+	}
 }

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,60 +39,24 @@
 #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()
 {
-	m_pParamsWriter = NULL;
-	m_pCurFileWriter = NULL;
-	m_bIsNoBase64Save = false;
-	m_bSaveChartAsImg = false;
+	m_pParamsWriter		= NULL;
+	m_pCurFileWriter	= NULL;
+
+	m_bIsNoBase64Save	= false;
+	m_bIsNoBase64		= false;
+	m_bSaveChartAsImg	= false;
 }
-bool BinDocxRW::CDocxSerializer::ConvertDocxToDoct(const std::wstring& sSrcFileName, const std::wstring& sDstFileName, const std::wstring& sTmpDir, const std::wstring& sXMLOptions)
+BinDocxRW::CDocxSerializer::~CDocxSerializer()
 {
-    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;
+	RELEASEOBJECT(m_pParamsWriter);
+	RELEASEOBJECT(m_pCurFileWriter);
 }
 bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions)
 {
@@ -106,6 +70,7 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, co
 	CFontManager* pFontManager = pFontPicker->get_FontManager();
 	DocWrapper::FontProcessor fp;
 	fp.setFontManager(pFontManager);
+	
 	NSBinPptxRW::CDrawingConverter oDrawingConverter;
 	oDrawingConverter.SetFontManager(pFontManager);
 	NSBinPptxRW::CBinaryFileWriter& oBufferedStream = *oDrawingConverter.m_pBinaryWriter;
@@ -131,16 +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);
@@ -156,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();
 		}
@@ -207,6 +181,7 @@ bool BinDocxRW::CDocxSerializer::CreateDocxFolders(std::wstring strDirectory, st
 bool BinDocxRW::CDocxSerializer::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 bResultOk = false;
+	RELEASEOBJECT(m_pCurFileWriter);
 	
 	NSFile::CFileBinary oFile;
 	if(oFile.OpenFile(sSrcFileName))
@@ -257,97 +232,103 @@ 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);
+				
 				m_pCurFileWriter = new Writers::FileWriter(sDstPath, m_sFontDir, false, nVersion, m_bSaveChartAsImg, &oDrawingConverter, sThemePath);
 
-				//папка с картинками
+	//папка с картинками
 				std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
                 std::wstring sFileInDir = strFileInDir.c_str();
 
-                oDrawingConverter.SetSourceFileDir(sFileInDir);
-	//default theme
-				m_pCurFileWriter->m_oDefaultTheme.Write(sThemePath);
+                oDrawingConverter.SetSrcPath(sFileInDir);
 				
 				BinaryFileReader oBinaryFileReader(sFileInDir, oBufferedStream, *m_pCurFileWriter);
 				oBinaryFileReader.ReadFile();
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-				OOX::CContentTypes oContentTypes;
+	//themes
+				m_pCurFileWriter->m_oTheme.Write(sThemePath);
+
+				OOX::CContentTypes *pContentTypes = oDrawingConverter.GetContentTypes();
 	//docProps
                 OOX::CPath pathDocProps = sDstPath + FILE_SEPARATOR_STR + _T("docProps");
                 NSDirectory::CreateDirectory(pathDocProps.GetPath());
 				
                 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("3.0000"));
+					pApp->SetAppVersion(_T("5.0"));
 					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);
+					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(""));
 					pCore->SetLastModifiedBy(_T(""));
-					pCore->write(pathDocProps + FILE_SEPARATOR_STR + _T("core.xml"), DocProps, oContentTypes);
+					pCore->write(pathDocProps + FILE_SEPARATOR_STR + _T("core.xml"), DocProps, *pContentTypes);
 					delete pCore;
 				} 
 /////////////////////////////////////////////////////////////////////////////////////
-                m_pCurFileWriter->m_oContentTypesWriter.AddOverrideRaw(oDrawingConverter.GetContentTypes());
+				m_pCurFileWriter->Write();
+				pContentTypes->Write(sDstPath);
 
-				m_pCurFileWriter->m_oCommentsWriter.Write();
-				m_pCurFileWriter->m_oChartWriter.Write();
-				m_pCurFileWriter->m_oStylesWriter.Write();
-				m_pCurFileWriter->m_oNumberingWriter.Write();
-				m_pCurFileWriter->m_oFontTableWriter.Write();
-				m_pCurFileWriter->m_oHeaderFooterWriter.Write();
-				m_pCurFileWriter->m_oFootnotesWriter.Write();
-				m_pCurFileWriter->m_oEndnotesWriter.Write();
-				//Setting пишем после HeaderFooter, чтобы заполнить evenAndOddHeaders
-				m_pCurFileWriter->m_oSettingWriter.Write();
-				m_pCurFileWriter->m_oWebSettingsWriter.Write();
-				//Document пишем после HeaderFooter, чтобы заполнить sectPr
-				m_pCurFileWriter->m_oDocumentWriter.Write();
-				//Rels и ContentTypes пишем в конце
-				m_pCurFileWriter->m_oDocumentRelsWriter.Write();
-				m_pCurFileWriter->m_oContentTypesWriter.Write();
-
-				//CSerializer oSerializer = CSerializer();
-				//if(false != oSerializer.Write(oBufferedStream, sDirectoryOut))
-				//{
 				bResultOk = true;
-				//}
+
 			}
+			if (!bIsNoBase64)
+			{
+				RELEASEARRAYOBJECTS(pData);
+			}
+
 		}
 		RELEASEARRAYOBJECTS(pBase64Data);
 	}
@@ -371,11 +352,6 @@ bool BinDocxRW::CDocxSerializer::getBinaryContent(const std::wstring& bsTxConten
 
 	XmlUtils::CXmlLiteReader oReader;
 	
-//    std::wstring bsTxContentTemp = _T("<root xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" 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\">");
-//
-//    bsTxContentTemp += bsTxContent;
-//    bsTxContentTemp + _T("</root>");
-    
     std::wstring sBegin(_T("<root xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" 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\">"));
     
     std::wstring sEnd(_T("</root>"));
@@ -397,7 +373,8 @@ bool BinDocxRW::CDocxSerializer::getBinaryContent(const std::wstring& bsTxConten
 
 	BinDocxRW::BinaryCommonWriter oBinaryCommonWriter(oParamsWriter);
 	int nCurPos = oBinaryCommonWriter.WriteItemWithLengthStart();
-	BinDocxRW::ParamsDocumentWriter oParams(oParamsWriter.m_pCurRels, oParamsWriter.m_sCurDocumentPath);
+	BinDocxRW::ParamsDocumentWriter oParams(oParamsWriter.m_pCurRels);
+	
 	BinDocxRW::BinaryDocumentTableWriter oBinaryDocumentTableWriter(oParamsWriter, oParams, &oParamsWriter.m_mapIgnoreComments, NULL);
 	oBinaryDocumentTableWriter.WriteDocumentContent(oSdtContent.m_arrItems);
 	oBinaryCommonWriter.WriteItemWithLengthEnd(nCurPos);
@@ -419,7 +396,8 @@ bool BinDocxRW::CDocxSerializer::getBinaryContentElem(OOX::EElementType eElemTyp
 
 	BinDocxRW::BinaryCommonWriter oBinaryCommonWriter(oParamsWriter);
 	int nCurPos = oBinaryCommonWriter.WriteItemWithLengthStart();
-	BinDocxRW::ParamsDocumentWriter oParams(oParamsWriter.m_pCurRels, oParamsWriter.m_sCurDocumentPath);
+	
+	BinDocxRW::ParamsDocumentWriter oParams(oParamsWriter.m_pCurRels);
 	BinDocxRW::BinaryDocumentTableWriter oBinaryDocumentTableWriter(oParamsWriter, oParams, &oParamsWriter.m_mapIgnoreComments, NULL);
 	if(OOX::et_m_oMathPara == eElemType)
 	{
@@ -431,6 +409,11 @@ bool BinDocxRW::CDocxSerializer::getBinaryContentElem(OOX::EElementType eElemTyp
 		OOX::Logic::COMath* pMath = static_cast<OOX::Logic::COMath*>(pElem);
 		oBinaryDocumentTableWriter.WriteMathArgNodes(pMath->m_arrItems);
 	}
+	else if(OOX::et_w_sdtContent == eElemType)
+	{
+		OOX::Logic::CSdtContent* pContent = static_cast<OOX::Logic::CSdtContent*>(pElem);
+		oBinaryDocumentTableWriter.WriteDocumentContent(pContent->m_arrItems);
+	}
 	oBinaryCommonWriter.WriteItemWithLengthEnd(nCurPos);
 
 	oParamsWriter.m_pCBufferedStream = pBufferedStreamOld;
@@ -475,6 +458,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

@@ -51,17 +51,17 @@ namespace BinDocxRW
 	class CDocxSerializer
 	{
 	public:
-        std::wstring m_sFontDir;
-        std::wstring m_sEmbeddedFontsDir;
-		bool m_bIsNoBase64Save;
-		bool m_bSaveChartAsImg;
-		ParamsWriter* m_pParamsWriter;
-		Writers::FileWriter* m_pCurFileWriter;
-	public:
+        std::wstring			m_sFontDir;
+        std::wstring			m_sEmbeddedFontsDir;
+		bool					m_bIsNoBase64Save;
+		bool					m_bIsNoBase64;
+		bool					m_bSaveChartAsImg;
+		ParamsWriter*			m_pParamsWriter;
+		Writers::FileWriter*	m_pCurFileWriter;
+
 		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);
-		
+		virtual ~CDocxSerializer();
+
         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);
 
@@ -76,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 {
@@ -80,24 +86,24 @@ namespace DocWrapper {
 		return fontName;
 	}
 	
-    std::wstring FontProcessor::getFont(const NSCommon::nullable<OOX::Spreadsheet::CFontScheme>& oScheme, const NSCommon::nullable<ComplexTypes::Spreadsheet::String>& oRFont, const NSCommon::nullable<OOX::Spreadsheet::CCharset>& oCharset, const NSCommon::nullable<OOX::Spreadsheet::CFontFamily >& oFamily, OOX::CTheme* pTheme)
+	std::wstring FontProcessor::getFont(const NSCommon::nullable<OOX::Spreadsheet::CFontScheme>& oScheme, const NSCommon::nullable<ComplexTypes::Spreadsheet::String>& oRFont, const NSCommon::nullable<OOX::Spreadsheet::CCharset>& oCharset, const NSCommon::nullable<OOX::Spreadsheet::CFontFamily >& oFamily, PPTX::Theme* pTheme)
 	{
 		CFontSelectFormat oFontSelectFormat;
         std::wstring sFontName;
 		if(NULL != pTheme && oScheme.IsInit() && oScheme->m_oFontScheme.IsInit())
 		{
-			//берем шрифт из темы
+	//берем шрифт из темы
 			const SimpleTypes::Spreadsheet::EFontScheme eFontScheme = oScheme->m_oFontScheme->GetValue();
 			if(SimpleTypes::Spreadsheet::fontschemeMajor == eFontScheme)
-				sFontName = pTheme->GetMajorFont();
+				sFontName = pTheme->themeElements.fontScheme.majorFont.latin.typeface;
 			else if(SimpleTypes::Spreadsheet::fontschemeMinor == eFontScheme)
-				sFontName = pTheme->GetMinorFont();
+				sFontName = pTheme->themeElements.fontScheme.minorFont.latin.typeface;
 		}
         if(sFontName.empty() && oRFont.IsInit() && oRFont->m_sVal.IsInit())
 			sFontName = oRFont->ToString2();
         if(sFontName.empty())
             sFontName = std::wstring(gc_sNoNameFont);
-		//подбор перенесен в js
+	//подбор перенесен в js
 		return  sFontName;
 		
 		oFontSelectFormat.wsName = new std::wstring(sFontName);

ASCOfficeDocxFile2/DocWrapper/FontProcessor.h

@@ -30,26 +30,29 @@
  *
  */
 #pragma once
-//#include "../stdafx.h"
 
 #include <map>
 
 #include "../../DesktopEditor/fontengine/ApplicationFonts.h"
 
-//#include "DocWrapper/Base.h"
 namespace NSCommon{
 	template<class Type> class nullable;
 }
-namespace ComplexTypes{
-    namespace Spreadsheet{
+namespace ComplexTypes
+{
+    namespace Spreadsheet
+	{
         class String;
     }
 }
+namespace PPTX
+{
+	class Theme;
+}
 namespace OOX
 {
 	class CFont;
 	class CFontTable;
-	class CTheme;
 	namespace Spreadsheet
 	{
 		class CFont;
@@ -61,9 +64,10 @@ namespace OOX
 	}
 }
 
-namespace DocWrapper {
-	
-	class FontProcessor {
+namespace DocWrapper 
+{
+	class FontProcessor 
+	{
 		CFontManager* m_pFontManager;
         std::map<std::wstring, std::wstring> fontMap;
 
@@ -76,7 +80,7 @@ namespace DocWrapper {
 		void setFontTable(OOX::CFontTable* fontTable);
 		
         std::wstring getFont(const std::wstring& name);
-        std::wstring getFont(const NSCommon::nullable<OOX::Spreadsheet::CFontScheme>& oScheme, const NSCommon::nullable<ComplexTypes::Spreadsheet::String>& oRFont, const NSCommon::nullable<OOX::Spreadsheet::CCharset>& oCharset, const NSCommon::nullable<OOX::Spreadsheet::CFontFamily >& oFamily, OOX::CTheme* pTheme);
+		std::wstring getFont(const NSCommon::nullable<OOX::Spreadsheet::CFontScheme>& oScheme, const NSCommon::nullable<ComplexTypes::Spreadsheet::String>& oRFont, const NSCommon::nullable<OOX::Spreadsheet::CCharset>& oCharset, const NSCommon::nullable<OOX::Spreadsheet::CFontFamily >& oFamily, PPTX::Theme* pTheme);
 	private:
 		void addToFontMap(OOX::CFont& font);
 	};

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,17 +87,18 @@ 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)
 	{
-		NSBinPptxRW::CDrawingConverter oOfficeDrawingConverter;
-		oOfficeDrawingConverter.SetMediaDstPath(sMediaDir);
-		oOfficeDrawingConverter.SetEmbedDstPath(sEmbedDir);
+        std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
 
-		//папка с бинарников
-		std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
+		NSBinPptxRW::CDrawingConverter oDrawingConverter;
+		
+        oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"xl");
+        oDrawingConverter.SetSrcPath(strFileInDir, 2);
 
-        oOfficeDrawingConverter.SetSourceFileDir(strFileInDir, 2);
+		oDrawingConverter.SetMediaDstPath(sMediaDir);
+		oDrawingConverter.SetEmbedDstPath(sEmbedDir);
 
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;
-		oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oOfficeDrawingConverter, sXMLOptions);
+		oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions);
 		return true;
 	}
     bool CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)
@@ -134,78 +137,59 @@ 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;
 	}
-    bool CXlsxSerializer::loadChart(const std::wstring& sChartPath, NSBinPptxRW::CBinaryFileWriter& oBufferedStream, long& lDataSize)
+ 	bool CXlsxSerializer::saveChart(NSBinPptxRW::CBinaryFileReader* pReader, long lLength, const std::wstring& sFilepath, const long& lChartNumber)
 	{
+		if (NULL == pReader) return false;
+		if (NULL == m_pExternalDrawingConverter) return false;
 		bool bRes = false;
-		//todo передать нормальный oRootPath
-		OOX::CPath oRootPath;
-		OOX::Spreadsheet::CChartSpace oChart(oRootPath, sChartPath);
-		if(NULL != m_pExternalDrawingConverter)
+
+		m_pExternalDrawingConverter->SetDstContentRels();
+
+	//получаем sThemePath из bsFilename предполагая что папка theme находится на уровень выше bsFilename
+		std::wstring sThemePath;
+		std::wstring sEmbedingPath;
+		std::wstring sContentTypePath;
+		
+        int nIndex	= (int)sFilepath.rfind(FILE_SEPARATOR_CHAR); 
+        nIndex		= (int)sFilepath.rfind(FILE_SEPARATOR_CHAR, nIndex - 1);
+		if(-1 != nIndex)
 		{
-			long nStartPos = oBufferedStream.GetPosition();
-			BinXlsxRW::BinaryCommonWriter oBcw(oBufferedStream);
-
-            std::wstring sOldRelsPath = m_pExternalDrawingConverter->GetRelsPath();
-			m_pExternalDrawingConverter->SetRelsPath(sChartPath);
-
-			BinXlsxRW::BinaryChartWriter oBinaryChartWriter(oBufferedStream, m_pExternalDrawingConverter);	
-			oBinaryChartWriter.WriteCT_ChartSpace(oChart);
-
-			m_pExternalDrawingConverter->SetRelsPath(sOldRelsPath);
-
-			long nEndPos = oBufferedStream.GetPosition();
-			lDataSize = nEndPos - nStartPos;
-			bRes = true;
+            std::wstring sFilepathLeft = sFilepath.substr(0, nIndex + 1);
+			sThemePath		= sFilepathLeft + L"theme";
+			sEmbedingPath	= sFilepathLeft + L"embeddings";
 		}
-		return bRes;
-	}
-    bool CXlsxSerializer::saveChart(NSBinPptxRW::CBinaryFileReader& oBufferedStream, long lLength, const std::wstring& sFilepath, const std::wstring& sContentTypePath, std::wstring** sContentTypeElement, const long& lChartNumber)
-	{
-		bool bRes = false;
-		*sContentTypeElement = NULL;
-		if(NULL != m_pExternalDrawingConverter)
-		{
-			m_pExternalDrawingConverter->SetDstContentRels();
-
-		//получаем sThemePath из bsFilename предполагая что папка theme находится на уровень выше bsFilename
-			std::wstring sThemePath;
-			std::wstring sEmbedingPath;
-			
-            int nIndex	= (int)sFilepath.rfind(FILE_SEPARATOR_CHAR); 
-            nIndex		= (int)sFilepath.rfind(FILE_SEPARATOR_CHAR, nIndex - 1);
-			if(-1 != nIndex)
-			{
-                std::wstring sFilepathLeft = sFilepath.substr(0, nIndex + 1);
-				sThemePath		= sFilepathLeft + L"theme";
-				sEmbedingPath	= sFilepathLeft + L"embeddings";
-			}
+        if		(pReader->m_nDocumentType == XMLWRITER_DOC_TYPE_DOCX)	sContentTypePath = L"/word/charts/";
+		else if (pReader->m_nDocumentType == XMLWRITER_DOC_TYPE_XLSX)	sContentTypePath = L"/xl/charts/";
+		else															sContentTypePath = L"/ppt/charts/";
 
 	//todo theme path
-			BinXlsxRW::SaveParams			oSaveParams(sThemePath);
-			OOX::Spreadsheet::CChartSpace	oChartSpace;
-			BinXlsxRW::BinaryChartReader	oBinaryChartReader(oBufferedStream, oSaveParams, m_pExternalDrawingConverter);
-			
-			oBinaryChartReader.ReadCT_ChartSpace(lLength, &oChartSpace.m_oChartSpace);
+		BinXlsxRW::SaveParams			oSaveParams(sThemePath, m_pExternalDrawingConverter->GetContentTypes());
+		OOX::Spreadsheet::CChartSpace	oChartSpace(NULL);
+		BinXlsxRW::BinaryChartReader	oBinaryChartReader(*pReader, oSaveParams, m_pExternalDrawingConverter);
+		
+		oBinaryChartReader.ReadCT_ChartSpace(lLength, &oChartSpace.m_oChartSpace);
 
-			if(oChartSpace.isValid())
+		if(oChartSpace.isValid())
+		{
+			//save xlsx embedded for chart
+			if(pReader->m_nDocumentType != XMLWRITER_DOC_TYPE_XLSX && !sEmbedingPath.empty())
 			{
-				//todo не делать embeddings, если пишем xlsx
-				//save xlsx
-				if(!sEmbedingPath.empty())
+				std::wstring sXlsxFilename = L"Microsoft_Excel_Worksheet" + std::to_wstring(lChartNumber) + L".xlsx";
+				std::wstring sXlsxPath = sEmbedingPath + FILE_SEPARATOR_STR + sXlsxFilename;
+				
+				if (writeChartXlsx(sXlsxPath, oChartSpace))
 				{
-					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");
 
 					std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
 					long rId;
-                    std::wstring bstrChartsWorksheetRelType = OOX::Spreadsheet::FileTypes::ChartsWorksheet.RelationType();
-                    m_pExternalDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &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();
@@ -214,30 +198,24 @@ namespace BinXlsxRW{
 					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;
-                std::wstring strDir              = NSSystemPath::GetDirectoryName(strFilepath);
-                std::wstring strFilename         = NSSystemPath::GetFileName(strFilepath);
-
-                OOX::CPath pathRelsDir = strDir + FILE_SEPARATOR_STR + _T("_rels");
-
-                OOX::CSystemUtility::CreateDirectories(pathRelsDir.GetPath());
-
-				oChartSpace.write2(sFilepath);
-
-                OOX::CPath pathRelsFile = pathRelsDir + FILE_SEPARATOR_STR + strFilename + _T(".rels");
-                m_pExternalDrawingConverter->SaveDstContentRels(pathRelsFile.GetPath());
-
-                std::wstring sContentType(sContentTypePath);
-                sContentType += strFilename;
-
-                std::wstring sContent = L"<Override PartName=\"" + sContentType + L"\" ContentType=\"application/vnd.openxmlformats-officedocument.drawingml.chart+xml\"/>";
-                sContent += oSaveParams.sAdditionalContentTypes;
-
-                (*sContentTypeElement) = new std::wstring(sContent);
-				
-				bRes = true;
 			}
+
+			std::wstring strFilepath	= sFilepath;
+            std::wstring strDir			= NSSystemPath::GetDirectoryName(strFilepath);
+            std::wstring strFilename	= NSSystemPath::GetFileName(strFilepath);
+
+            OOX::CPath pathRelsDir = strDir + FILE_SEPARATOR_STR + _T("_rels");
+
+            OOX::CSystemUtility::CreateDirectories(pathRelsDir.GetPath());
+
+			oChartSpace.write2(sFilepath);
+
+            OOX::CPath pathRelsFile = pathRelsDir + FILE_SEPARATOR_STR + strFilename + _T(".rels");
+            m_pExternalDrawingConverter->SaveDstContentRels(pathRelsFile.GetPath());
+
+			pReader->m_pRels->m_pManager->m_pContentTypes->Registration(L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml", sContentTypePath, strFilename);
+			
+			bRes = true;
 		}
 		return bRes;
 	}
@@ -253,30 +231,39 @@ namespace BinXlsxRW{
 	{
 		m_pExternalDrawingConverter = pDrawingConverter;
 	}
-	void CXlsxSerializer::writeChartXlsx(const std::wstring& sDstFile, const OOX::Spreadsheet::CChartSpace& oChart)
+	void CXlsxSerializer::setIsNoBase64(bool bIsNoBase64)
 	{
-		//анализируем chart
+		m_bIsNoBase64 = bIsNoBase64;
+	}
+
+	bool CXlsxSerializer::writeChartXlsx(const std::wstring& sDstFile, const OOX::Spreadsheet::CChartSpace& oChart)
+	{
+	//анализируем chart
 		BinXlsxRW::ChartWriter helper;
 		helper.parseChart(oChart.m_oChartSpace.m_chart);
-		//создаем temp
+	//создаем temp
 		std::wstring sTempDir = NSSystemPath::GetDirectoryName(sDstFile) + FILE_SEPARATOR_STR + NSSystemPath::GetFileName(sDstFile) + L"_TEMP";
 		NSDirectory::CreateDirectory(sTempDir);
 		OOX::CPath oPath(sTempDir.c_str());
-		//шиблонные папки
+	//шиблонные папки
         std::wstring sXmlOptions = _T("");
         std::wstring sMediaPath;// will be filled by 'CreateXlsxFolders' method
         std::wstring sEmbedPath; // will be filled by 'CreateXlsxFolders' method
 		CreateXlsxFolders (sXmlOptions, sTempDir, sMediaPath, sEmbedPath);
-		//заполняем Xlsx
+	//заполняем Xlsx
 		OOX::Spreadsheet::CXlsx oXlsx;
 		helper.toXlsx(oXlsx);
-		//write
-        std::wstring sAdditionalContentTypes;
-		oXlsx.Write(oPath, sAdditionalContentTypes);
-		//zip
-		COfficeUtils oOfficeUtils(NULL);
-		oOfficeUtils.CompressFileOrDirectory(sTempDir, sDstFile, true);
-		//clean
+	//write
+		OOX::CContentTypes oContentTypes;
+		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,23 +55,24 @@ namespace BinXlsxRW {
         std::wstring m_sFontDir;
         std::wstring m_sEmbeddedFontsDir;
 		NSBinPptxRW::CDrawingConverter* m_pExternalDrawingConverter;
+		bool m_bIsNoBase64;
 	public:
 		CXlsxSerializer();
 		~CXlsxSerializer();
 		
-        void CreateXlsxFolders  (const std::wstring& sXmlOptions, const std::wstring& sDstPath, std::wstring& sMediaPath, std::wstring& sEmbedPath);
+        static void CreateXlsxFolders  (const std::wstring& sXmlOptions, const std::wstring& sDstPath, std::wstring& sMediaPath, std::wstring& sEmbedPath);
 
         bool loadFromFile       (const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedPath);
         bool saveToFile         (const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions);
 		
-        bool loadChart          (const std::wstring& sChartPath, NSBinPptxRW::CBinaryFileWriter& oBufferedStream, long& lDataSize);
-        bool saveChart          (NSBinPptxRW::CBinaryFileReader& oBufferedStream, long lLength, const std::wstring& sFilename, const std::wstring& sContentTypePath, std::wstring** sContentTypeElement, const long& lChartNumber);
+        bool saveChart          (NSBinPptxRW::CBinaryFileReader* pReader, long lLength, const std::wstring& sFilename, const long& lChartNumber);
 		
         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/Linux/ASCOfficeDocxFile2Lib.pro

@@ -42,15 +42,15 @@ SOURCES += \
     ../../XlsxSerializerCom/Reader/CommonWriter.cpp \
     ../../XlsxSerializerCom/Reader/CSVReader.cpp \
     ../../XlsxSerializerCom/Writer/CSVWriter.cpp \
-    ../../OfficeCryptReader/source/ECMACryptReader.cpp \
-    ../../OfficeCryptReader/source/CryptTransform.cpp
+    ../../OfficeCryptReader/source/ECMACryptFile.cpp \
+    ../../OfficeCryptReader/source/CryptTransform.cpp \
+    ../BinReader/Readers.cpp
 
 HEADERS += ../DocWrapper/DocxSerializer.h \
     ../DocWrapper/FontProcessor.h \
     ../DocWrapper/XlsxSerializer.h \
     ../BinReader/ChartWriter.h \
     ../BinReader/CommentsWriter.h \
-    ../BinReader/ContentTypesWriter.h \
     ../BinReader/DocumentRelsWriter.h \
     ../BinReader/DocumentWriter.h \
     ../BinReader/FileWriter.h \
@@ -78,5 +78,5 @@ HEADERS += ../DocWrapper/DocxSerializer.h \
     ../../Common/FileDownloader/FileDownloader.h \
     ../BinReader/DefaultThemeWriter.h \
     ../DocWrapper/ChartWriter.h \
-    ../../OfficeCryptReader/source/ECMACryptReader.h \
+    ../../OfficeCryptReader/source/ECMACryptFile.h \
     ../../OfficeCryptReader/source/CryptTransform.h