.

* 'develop' of https://github.com/ONLYOFFICE/core:
  fix bug #35895
  x2t version up
  OdfFormatReader - fix after testing

.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;
@@ -963,4 +963,3 @@ namespace DocFormatUtils
 	};
 }
 
-using namespace DocFormatUtils;

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

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

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

@@ -157,6 +157,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/Converter.cpp

@@ -65,7 +65,7 @@ namespace DocFileFormat
 	{
 		ConversionContext context( doc, docx );
 
-		//Write styles.xml
+	//Write styles.xml
 		if (doc->Styles)
 		{
 			StyleSheetMapping styleSheetMapping( &context );
@@ -88,9 +88,7 @@ namespace DocFileFormat
 				return S_FALSE;
 			}
 		}
-
-
-		//Write numbering.xml
+	//Write numbering.xml
 		if (doc->listTable)
 		{
 			NumberingMapping numberingMapping( &context );
@@ -110,7 +108,7 @@ namespace DocFileFormat
 			}
 		}
 
-		//Write fontTable.xml
+	//Write fontTable.xml
 		if (doc->FontTable)
 		{
 			FontTableMapping fontTableMapping( &context );
@@ -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

@@ -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);
@@ -811,10 +832,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 +902,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 +969,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 +1061,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)
 	{
@@ -1540,7 +1583,6 @@ namespace DocFileFormat
 		return cpCellEnd;
 	}
 
-	//
 	bool DocumentMapping::writeBookmarks(int cp)
 	{
 		bool result =	true;
@@ -1561,7 +1603,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 +1647,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 +1662,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 +1743,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

@@ -99,8 +99,9 @@ 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 );
@@ -121,6 +122,10 @@ namespace DocFileFormat
 		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/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/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/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/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,11 +35,23 @@
 
 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)
 		{
 			if ((pSegmentInfo != NULL) && (pSegmentInfoSize > 0))
 			{
@@ -105,31 +117,47 @@ namespace DocFileFormat
 				unsigned short nElemsAlloc	=	FormatUtils::BytesToUInt16(pVertices, 2, pVerticesSize);
 				unsigned short cb			=	FormatUtils::BytesToUInt16(pVertices, 4, pVerticesSize);
 
-				if (0xfff0 == cb)
-				{
-					cb	=	4;
-
-					for (unsigned short i = 0; i < nElems; ++i)
+				for (unsigned short i = 0; i < nElems; ++i)
+				{				
+					POINT point;	
+					if (0xfff0 == cb)
 					{
-						POINT point;
-
+						cb	=	4;						
 						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);
 					}
-				}
-				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);
 					}
+
+					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 +191,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,8 +597,8 @@ namespace DocFileFormat
 
 		virtual ~ShapeOptions()
 		{
-			for (std::vector<OptionEntry>::iterator iter = Options.begin(); iter != Options.end(); ++iter)
-				RELEASEARRAYOBJECTS( iter->opComplex );
+			//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)
@@ -606,16 +607,16 @@ namespace DocFileFormat
 
 			//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 );
 			}
@@ -625,21 +626,12 @@ namespace DocFileFormat
 			//of the OptionEntry arry, 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/OpenXmlPackage.cpp

@@ -73,7 +73,6 @@ namespace DocFileFormat
 
         NSDirectory::CreateDirectory( m_strOutputPath + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"_rels" );
 
-
 		WriteRelsFile( DocumentRelationshipsFile );
 
 		WriteRelsFile( FootnotesRelationshipsFile );
@@ -199,7 +198,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/StructuredStorageReader.h

@@ -42,7 +42,6 @@ namespace DocFileFormat
 		{
 
 		}
-
 		~StructuredStorageReader()
 		{
 			if(m_pStorage)
@@ -62,6 +61,12 @@ namespace DocFileFormat
 			}
 			return false;
 		}
+		bool isDirectory( const std::string& name )
+		{
+			if (!m_pStorage) return false;
+			
+			return m_pStorage->isDirectory(name);
+		}
 
 		bool GetStream (const char *path, POLE::Stream** ppStream)
 		{
@@ -79,8 +84,78 @@ namespace DocFileFormat
 		{
 			return m_pStorage;
 		}
+	
+		void copy( int indent, std::string path, POLE::Storage * storageOut, bool withRoot = true)
+		{
+			std::list<std::string> entries, entries_sort;
+			entries = m_pStorage->entries( path );
+			
+			for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++ )
+			{
+				std::string name = *it;
+				std::string 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::string>::iterator it = entries_sort.begin(); it != entries_sort.end(); it++ )
+			{
+				std::string name = *it;
+				std::string fullname = path + name;
+		       
+				if( m_pStorage->isDirectory( fullname ) )
+				{
+					copy( indent + 1, fullname + "/", storageOut, withRoot );
+				}
+				else
+				{
+					copy_stream(fullname, storageOut, withRoot);
+				}
+			}
+		}
 
 	private:
+		void copy_stream(std::string streamName, POLE::Storage * storageOut, bool withRoot = true)
+		{
+			POLE::Stream *stream = new POLE::Stream(m_pStorage, streamName);
+			if (!stream) return;
+
+			stream->seek(0);
+			int size_stream = stream->size();
+
+			if (withRoot == false)
+			{
+				int pos = streamName.find("/");
+				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/TablePropertiesMapping.cpp

@@ -488,7 +488,7 @@ namespace DocFileFormat
 		{
 			for ( unsigned int i = 0, nSize = _grid->size(); i < nSize; i++ )
 			{
-				if(_grid->at(i) % DocFormatUtils::gc_nZeroWidth != 0)
+				if(_grid->at(i) % DocFileFormat::gc_nZeroWidth != 0)
 				{
 					bWriteGridCol = true;
 					break;

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,14 +138,18 @@ 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());
@@ -186,6 +192,7 @@ namespace DocFileFormat
 				if (res) break;
 			}
 		}
+		NSFile::CFileBinary::Remove(sTempXmlFile);
 		return res;
 	}
 //---------------------------------------------------------------
@@ -236,7 +243,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 +284,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 +294,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 +304,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:

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>())
 			{
@@ -294,13 +293,17 @@ namespace DocFileFormat
 
 		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 +338,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 +357,80 @@ namespace DocFileFormat
 					}
 				}
 				break;
-
-				// GEOMETRY
-
+// GEOMETRY
+			case shapePath :
+				{
+					bHavePath =	true;
+				}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 +445,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 +492,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 +529,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 +558,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 +642,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 +716,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,7 +740,7 @@ 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);
 
@@ -713,7 +753,7 @@ namespace DocFileFormat
 				}break;
 			case gtextFont:
 				{
-					std::wstring font = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex, (iter->op)/2);
+					std::wstring font = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex.get(), (iter->op)/2);
 					int i = font.size();
 					while (i > 0)
 					{
@@ -764,31 +804,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 +844,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 +859,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 +1022,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 +1236,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();
@@ -1385,7 +1441,7 @@ namespace DocFileFormat
 	{
 		if ((style != NULL) && (anchor != NULL))
 		{
-			DocFormatUtils::Rectangle bounds = anchor->rcgBounds;
+			DocFileFormat::Rectangle bounds = anchor->rcgBounds;
 
 			if (twistDimensions)
 			{
@@ -1498,7 +1554,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 +1564,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
@@ -1616,15 +1672,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 +1905,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 < 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;

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.h

@@ -77,17 +77,10 @@ namespace DocFileFormat
 
 		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

@@ -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 );
 		}
@@ -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

@@ -52,7 +52,8 @@ 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;
@@ -139,7 +140,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) 
 				{
@@ -275,12 +276,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 +295,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);
@@ -470,23 +483,28 @@ namespace DocFileFormat
 			delete storageOut;
 			return false;
 		}
-		std::list<std::string> listStream = storageIn->entries();
+		DecryptStream( 0, "/", 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;
 
@@ -508,40 +526,80 @@ namespace DocFileFormat
 		}
 		return true;
 	}
-
-
-	bool WordDocument::DecryptStream(CRYPT::Decryptor* Decryptor, std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut)
+	void WordDocument::DecryptStream( int level, std::string path, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor)
+	{
+		std::list<std::string> entries, entries_sort;
+		entries = storageIn->entries( path );
+		
+		for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++ )
+		{
+			std::string name = *it;
+			std::string fullname = path + name;
+	       
+			if( storageIn->isDirectory( fullname ) )
+			{
+				entries_sort.push_back(name);
+			}
+			else
+			{
+				entries_sort.push_front(name);
+			}
+		}	    
+		for( std::list<std::string>::iterator it = entries_sort.begin(); it != entries_sort.end(); ++it )
+		{
+			std::string name = *it;
+			std::string fullname = path + name;
+	       
+			if( storageIn->isDirectory( fullname ) )
+			{
+				DecryptStream( level + 1, fullname + "/", storageIn, storageOut, Decryptor );
+			}
+			else
+			{
+				DecryptStream(fullname, storageIn, storageOut, Decryptor );
+			}
+		}    
+	}
+	bool WordDocument::DecryptStream(std::string 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();
+		int 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("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);
+
+		int size_block = 0x200;
+		for (int pos = 0, block = 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 +680,8 @@ namespace DocFileFormat
 		RELEASEOBJECT(SectionPlex);
 		RELEASEOBJECT(BookmarkStartPlex);
 		RELEASEOBJECT(BookmarkEndPlex);
+		RELEASEOBJECT(AnnotStartPlex);
+		RELEASEOBJECT(AnnotEndPlex);
 		RELEASEOBJECT(AutoTextPlex);
 		RELEASEOBJECT(ListPlex);
 		RELEASEOBJECT(Styles);

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -86,6 +86,7 @@ namespace DocFileFormat
 		friend class Table;
 		friend class TableRow;
 		friend class VMLShapeMapping;
+		friend class VMLPictureMapping;
 		friend class OpenXmlPackage;
 		friend class TextboxMapping;
 
@@ -98,16 +99,17 @@ namespace DocFileFormat
 
 		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);
-
+		
 		inline StructuredStorageReader* GetStorage() const
 		{
 			return m_pStorage;
 		}
-
+	private:
+		bool DecryptOfficeFile	(CRYPT::Decryptor* Decryptor);
+		
+		bool DecryptStream		(std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor);
+		void DecryptStream		(int level, std::string 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

@@ -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("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, "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/Win32/DocFormatLib.vcproj

@@ -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"

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

@@ -54,17 +54,27 @@ int _tmain(int argc, _TCHAR* argv[])
 	if (argc < 2) return 1;
 
 	std::wstring sSrcDoc	= argv[1];
-	std::wstring sDstDocx	= argc > 2 ? argv[2] : sSrcDoc + L"-my.docx";
+	std::wstring sDstDocx;
 
-	std::wstring outputDir		= NSDirectory::GetFolderPath(sDstDocx);
+	std::wstring outputDir		= NSDirectory::GetFolderPath(sSrcDoc);
 	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
 
 	COfficeDocFile docFile;
 
 	docFile.m_sTempFolder = outputDir;
 	
-	HRESULT hRes = docFile.LoadFromFile( sSrcDoc, dstTempPath, L"password", NULL);
+	bool bMacros = true;
+	HRESULT hRes = docFile.LoadFromFile( sSrcDoc, dstTempPath, L"password", bMacros, NULL);
 	
+	if (bMacros)
+	{
+		sDstDocx = sSrcDoc + L"-my.docm";
+	}
+	else
+	{
+		sDstDocx = sSrcDoc + L"-my.docx";
+
+	}
 	if (hRes == S_OK)
 	{
 		COfficeUtils oCOfficeUtils(NULL);

ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj

@@ -44,7 +44,7 @@
 			<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"
@@ -385,6 +385,10 @@
 				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\BinReader\Readers.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
 				>
@@ -434,6 +438,10 @@
 			RelativePath="..\..\Common\FileDownloader\FileDownloader_win.cpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\Common\OfficeFileFormatChecker2.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,43 @@ 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,10 +55,10 @@ 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_End = _T("</w:hdr>");
@@ -74,12 +75,11 @@ namespace Writers
 	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 +109,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 +122,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 +159,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
@@ -403,6 +405,8 @@ public:
     std::wstring Fill;
     std::wstring Del;
     std::wstring Ins;
+	std::wstring MoveFrom;
+	std::wstring MoveTo;
     std::wstring rPrChange;
 
 	bool bBold;
@@ -490,13 +494,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 +753,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 +1583,7 @@ public:
     std::wstring UserName;
     std::wstring UserId;
     std::wstring Date;
+	std::wstring OOData;
 	bool Solved;
     std::wstring Text;
     std::wstring m_sParaId;
@@ -1696,9 +1707,16 @@ public:
 		{
             std::wstring sDate = XmlUtils::EncodeXmlString(pComment->Date);
             sRes += L" w:date=\"";
-            sRes += sDate;
+			sRes += sDate;
             sRes += L"\"";
 		}
+		if(false == pComment->OOData.empty())
+		{
+			std::wstring sData = XmlUtils::EncodeXmlString(pComment->OOData);
+			sRes += L" oodata=\"";
+			sRes += sData;
+			sRes += L"\"";
+		}
         if(false == sInitials.empty())
 		{
 			sInitials = XmlUtils::EncodeXmlString(sInitials);
@@ -1881,7 +1899,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 +1937,8 @@ public:
     int     m_nDocPr;
     std::wstring sGraphicFramePr;
     std::wstring sDocPr;
-
-    CDrawingPropertyWrap DrawingPropertyWrap;
+   
+	CDrawingPropertyWrap DrawingPropertyWrap;
 
     bool bDataPos;
 	bool bDataLength;
@@ -1949,6 +1972,10 @@ public:
     CDrawingProperty(int nDocPr)
 	{
         m_nDocPr    = nDocPr;
+
+		bObject		= false;
+		nObjectType	= 0;
+		nObjectId	= 0;
         bDataPos    = false;
 		bDataLength = false;
         bType       = false;
@@ -2062,7 +2089,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;

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();
+    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,7 @@
 
 #include "../../XlsxSerializerCom/Common/Common.h"
 #include "../../DesktopEditor/fontengine/FontManager.h"
+#include "../../DesktopEditor/fontengine/ApplicationFonts.h"
 
 namespace Writers
 {
@@ -48,8 +49,8 @@ namespace Writers
         CFontManager*           m_pFontManager;
 	public:
         std::map<std::wstring, int> m_mapFonts;
-	public:
-        FontTableWriter(std::wstring sDir, std::wstring sFontDir, bool bNoFontDir):m_sDir(sDir)
+
+		FontTableWriter(std::wstring sDir, std::wstring sFontDir, bool bNoFontDir):m_sDir(sDir)
 		{
 			m_pFontManager = NULL;
 			if(!bNoFontDir)
@@ -102,8 +103,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

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
 	{
@@ -381,7 +383,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 +467,14 @@ 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
 	};}
 	namespace c_oSerDocTableType{enum c_oSerDocTableType
 	{
@@ -477,7 +488,8 @@ extern int g_nCurFormatVersion;
 		Cell =  6,
 		Cell_Pr =  7,
 		Cell_Content =  8,
-		tblGridChange = 9
+		tblGridChange = 9,
+		Sdt = 10
 	};}
 	namespace c_oSerRunType{enum c_oSerRunType
 	{
@@ -510,6 +522,10 @@ extern int g_nCurFormatVersion;
 		endnoteReference = 27,
 		arPr = 28
 	};}
+	namespace c_oSerVbaProjectTypes{enum c_oSerVbaProjectType
+	{
+		Name = 0
+	};}
     namespace c_oSerBackgroundType{enum c_oSerBackgroundType
 	{
 		Color		= 0,
@@ -705,7 +721,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
 	{
@@ -910,7 +927,8 @@ extern int g_nCurFormatVersion;
 	namespace c_oSer_FldSimpleType{ enum c_oSer_FldSimpleType
 	{
 		Content = 0,
-		Instr = 1
+		Instr = 1,
+		FFData = 2
 	};}
 	namespace c_oSer_ColorThemeType{ enum c_oSer_ColorThemeType
 	{
@@ -997,6 +1015,90 @@ 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
+	};}
 }
 
 #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/DocxSerializer.cpp

@@ -43,56 +43,17 @@ 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 +67,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 +93,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 +127,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 +178,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,43 +229,63 @@ 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());
@@ -304,14 +296,14 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				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();
@@ -319,35 +311,21 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				{
 					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 +349,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 +370,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 +393,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 +406,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 +455,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

@@ -80,24 +80,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

@@ -49,6 +49,7 @@ namespace BinXlsxRW{
 	CXlsxSerializer::CXlsxSerializer()
 	{
 		m_pExternalDrawingConverter = NULL;
+		m_bIsNoBase64 = false;
 	}
 	CXlsxSerializer::~CXlsxSerializer()
 	{
@@ -85,17 +86,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,110 +136,83 @@ 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;
+		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;
-					writeChartXlsx(sXlsxPath, oChartSpace);
-
-					std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
-					long rId;
-                    std::wstring bstrChartsWorksheetRelType = OOX::Spreadsheet::FileTypes::ChartsWorksheet.RelationType();
-                    m_pExternalDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &rId);
-
-					oChartSpace.m_oChartSpace.m_externalData = new OOX::Spreadsheet::CT_ExternalData();
-					oChartSpace.m_oChartSpace.m_externalData->m_id = new std::wstring();
-					oChartSpace.m_oChartSpace.m_externalData->m_id->append(L"rId");
-					oChartSpace.m_oChartSpace.m_externalData->m_id->append(std::to_wstring(rId));
-					oChartSpace.m_oChartSpace.m_externalData->m_autoUpdate = new OOX::Spreadsheet::CT_Boolean();
-					oChartSpace.m_oChartSpace.m_externalData->m_autoUpdate->m_val = new bool(false);
-				}
-
-				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);
+				std::wstring sXlsxFilename = L"Microsoft_Excel_Worksheet" + std::to_wstring(lChartNumber) + L".xlsx";
+				std::wstring sXlsxPath = sEmbedingPath + FILE_SEPARATOR_STR + sXlsxFilename;
 				
-				bRes = true;
+				writeChartXlsx(sXlsxPath, oChartSpace);
+				pReader->m_pRels->m_pManager->m_pContentTypes->AddDefault(L"xlsx");
+
+				std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
+				long rId;
+                std::wstring bstrChartsWorksheetRelType = OOX::FileTypes::MicrosoftOfficeExcelWorksheet.RelationType();
+                m_pExternalDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &rId);
+
+				oChartSpace.m_oChartSpace.m_externalData = new OOX::Spreadsheet::CT_ExternalData();
+				oChartSpace.m_oChartSpace.m_externalData->m_id = new std::wstring();
+				oChartSpace.m_oChartSpace.m_externalData->m_id->append(L"rId");
+				oChartSpace.m_oChartSpace.m_externalData->m_id->append(std::to_wstring(rId));
+				oChartSpace.m_oChartSpace.m_externalData->m_autoUpdate = new OOX::Spreadsheet::CT_Boolean();
+				oChartSpace.m_oChartSpace.m_externalData->m_autoUpdate->m_val = new bool(false);
 			}
+
+			std::wstring strFilepath	= sFilepath;
+            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 +228,35 @@ namespace BinXlsxRW{
 	{
 		m_pExternalDrawingConverter = pDrawingConverter;
 	}
+	void CXlsxSerializer::setIsNoBase64(bool bIsNoBase64)
+	{
+		m_bIsNoBase64 = bIsNoBase64;
+	}
+
 	void CXlsxSerializer::writeChartXlsx(const std::wstring& sDstFile, const OOX::Spreadsheet::CChartSpace& oChart)
 	{
-		//анализируем chart
+	//анализируем 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);
+	//write
+		OOX::CContentTypes oContentTypes;
+		oXlsx.Write(oPath, oContentTypes);
 		//zip
 		COfficeUtils oOfficeUtils(NULL);
 		oOfficeUtils.CompressFileOrDirectory(sTempDir, sDstFile, true);
-		//clean
+	//clean
 		NSDirectory::DeleteDirectory(sTempDir);
 	}
 };

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h

@@ -55,21 +55,22 @@ 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);
 	};

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

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj

@@ -34,7 +34,6 @@
 		17C1FEB11ACC42C4006B99B3 /* Common.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F1F1AC4549B00BEA2EA /* Common.h */; };
 		17C1FEB21ACC42C4006B99B3 /* XlsxSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F131AC4546100BEA2EA /* XlsxSerializer.h */; };
 		17C1FEB31ACC42C4006B99B3 /* CSVReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F271AC4549B00BEA2EA /* CSVReader.h */; };
-		17C1FEB41ACC42C4006B99B3 /* ContentTypesWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EED1AC4544900BEA2EA /* ContentTypesWriter.h */; };
 		17C1FEB51ACC42C4006B99B3 /* HeaderFooterWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF41AC4544900BEA2EA /* HeaderFooterWriter.h */; };
 		17C1FEB61ACC42C4006B99B3 /* webSettingsWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EFB1AC4544900BEA2EA /* webSettingsWriter.h */; };
 		17C1FEB71ACC42C4006B99B3 /* SettingWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF91AC4544900BEA2EA /* SettingWriter.h */; };
@@ -43,14 +42,15 @@
 		17C1FEBC1ACC42C4006B99B3 /* DocxSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F0F1AC4546100BEA2EA /* DocxSerializer.h */; };
 		17C1FEBD1ACC42C4006B99B3 /* FileWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF21AC4544900BEA2EA /* FileWriter.h */; };
 		17C1FEBE1ACC42C4006B99B3 /* CSVWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F301AC4549B00BEA2EA /* CSVWriter.h */; };
+		690FE0851E9BBD68004B26D0 /* Readers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 690FE0841E9BBD68004B26D0 /* Readers.cpp */; };
 		69414A301CB51666003E771B /* ChartWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69414A2E1CB51666003E771B /* ChartWriter.cpp */; };
 		69414A311CB51666003E771B /* ChartWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 69414A2F1CB51666003E771B /* ChartWriter.h */; };
 		6967917C1D9E8AEE002CA4BA /* BinEquationWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 696791781D9E8AEE002CA4BA /* BinEquationWriter.h */; };
 		6967917D1D9E8AEE002CA4BA /* BinReaderWriterDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */; };
 		6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */; };
 		6967917F1D9E8AEE002CA4BA /* BinWriters.h in Headers */ = {isa = PBXBuildFile; fileRef = 6967917B1D9E8AEE002CA4BA /* BinWriters.h */; };
+		69BBDF251F0B8AAC00EB1BF7 /* FileDownloader_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */; };
 		69F181AF1C77274E00B2952B /* FileDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F181AD1C77274E00B2952B /* FileDownloader.h */; };
-		69F181B51C77276D00B2952B /* FileDownloader_curl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -58,7 +58,6 @@
 		17C1FEC21ACC42C4006B99B3 /* libASCOfficeDocxFile2Lib_ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libASCOfficeDocxFile2Lib_ios.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		17E17EEB1AC4544900BEA2EA /* ChartWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChartWriter.h; sourceTree = "<group>"; };
 		17E17EEC1AC4544900BEA2EA /* CommentsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommentsWriter.h; sourceTree = "<group>"; };
-		17E17EED1AC4544900BEA2EA /* ContentTypesWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentTypesWriter.h; sourceTree = "<group>"; };
 		17E17EF01AC4544900BEA2EA /* DocumentRelsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentRelsWriter.h; sourceTree = "<group>"; };
 		17E17EF11AC4544900BEA2EA /* DocumentWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentWriter.h; sourceTree = "<group>"; };
 		17E17EF21AC4544900BEA2EA /* FileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileWriter.h; sourceTree = "<group>"; };
@@ -91,14 +90,15 @@
 		17E17F2E1AC4549B00BEA2EA /* BinaryReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BinaryReader.h; sourceTree = "<group>"; };
 		17E17F2F1AC4549B00BEA2EA /* CSVWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSVWriter.cpp; sourceTree = "<group>"; };
 		17E17F301AC4549B00BEA2EA /* CSVWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSVWriter.h; sourceTree = "<group>"; };
+		690FE0841E9BBD68004B26D0 /* Readers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Readers.cpp; sourceTree = "<group>"; };
 		69414A2E1CB51666003E771B /* ChartWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChartWriter.cpp; sourceTree = "<group>"; };
 		69414A2F1CB51666003E771B /* ChartWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChartWriter.h; sourceTree = "<group>"; };
 		696791781D9E8AEE002CA4BA /* BinEquationWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinEquationWriter.h; path = ../../BinWriter/BinEquationWriter.h; sourceTree = "<group>"; };
 		696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinReaderWriterDefines.h; path = ../../BinWriter/BinReaderWriterDefines.h; sourceTree = "<group>"; };
 		6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BinWriters.cpp; path = ../../BinWriter/BinWriters.cpp; sourceTree = "<group>"; };
 		6967917B1D9E8AEE002CA4BA /* BinWriters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinWriters.h; path = ../../BinWriter/BinWriters.h; sourceTree = "<group>"; };
+		69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = FileDownloader_mac.mm; path = ../../../Common/FileDownloader/FileDownloader_mac.mm; sourceTree = "<group>"; };
 		69F181AD1C77274E00B2952B /* FileDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownloader.h; path = ../../../Common/FileDownloader/FileDownloader.h; sourceTree = "<group>"; };
-		69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDownloader_curl.cpp; path = ../../../Common/FileDownloader/FileDownloader_curl.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -145,7 +145,6 @@
 			children = (
 				17E17EEB1AC4544900BEA2EA /* ChartWriter.h */,
 				17E17EEC1AC4544900BEA2EA /* CommentsWriter.h */,
-				17E17EED1AC4544900BEA2EA /* ContentTypesWriter.h */,
 				17A765271B0F3DC30046BC0B /* DefaultThemeWriter.h */,
 				17E17EF01AC4544900BEA2EA /* DocumentRelsWriter.h */,
 				17E17EF11AC4544900BEA2EA /* DocumentWriter.h */,
@@ -159,6 +158,7 @@
 				17E17EF91AC4544900BEA2EA /* SettingWriter.h */,
 				17E17EFA1AC4544900BEA2EA /* StylesWriter.h */,
 				17E17EFB1AC4544900BEA2EA /* webSettingsWriter.h */,
+				690FE0841E9BBD68004B26D0 /* Readers.cpp */,
 			);
 			name = BinReader;
 			path = ../../BinReader;
@@ -230,7 +230,7 @@
 			isa = PBXGroup;
 			children = (
 				69F181AD1C77274E00B2952B /* FileDownloader.h */,
-				69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */,
+				69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */,
 			);
 			name = Common;
 			sourceTree = "<group>";
@@ -277,7 +277,6 @@
 				17C1FEB31ACC42C4006B99B3 /* CSVReader.h in Headers */,
 				6967917D1D9E8AEE002CA4BA /* BinReaderWriterDefines.h in Headers */,
 				69414A311CB51666003E771B /* ChartWriter.h in Headers */,
-				17C1FEB41ACC42C4006B99B3 /* ContentTypesWriter.h in Headers */,
 				17C1FEB51ACC42C4006B99B3 /* HeaderFooterWriter.h in Headers */,
 				17C1FEB61ACC42C4006B99B3 /* webSettingsWriter.h in Headers */,
 				17C1FEB71ACC42C4006B99B3 /* SettingWriter.h in Headers */,
@@ -315,7 +314,7 @@
 		17E17ED41AC453F800BEA2EA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Ascensio System SIA";
 			};
 			buildConfigurationList = 17E17ED71AC453F800BEA2EA /* Build configuration list for PBXProject "ASCOfficeDocxFile2Lib" */;
@@ -340,7 +339,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				69F181B51C77276D00B2952B /* FileDownloader_curl.cpp in Sources */,
 				17C1FE961ACC42C4006B99B3 /* Common.cpp in Sources */,
 				17C1FE971ACC42C4006B99B3 /* ChartFromToBinary.cpp in Sources */,
 				17C1FE981ACC42C4006B99B3 /* CSVReader.cpp in Sources */,
@@ -349,7 +347,9 @@
 				17C1FE9B1ACC42C4006B99B3 /* CSVWriter.cpp in Sources */,
 				69414A301CB51666003E771B /* ChartWriter.cpp in Sources */,
 				6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */,
+				69BBDF251F0B8AAC00EB1BF7 /* FileDownloader_mac.mm in Sources */,
 				17C1FE9C1ACC42C4006B99B3 /* XlsxSerializer.cpp in Sources */,
+				690FE0851E9BBD68004B26D0 /* Readers.cpp in Sources */,
 				17C1FE9D1ACC42C4006B99B3 /* FontProcessor.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -379,6 +379,7 @@
 					unix,
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
+					_XCODE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
@@ -401,6 +402,7 @@
 				EXECUTABLE_PREFIX = lib;
 				GCC_ENABLE_CPP_EXCEPTIONS = YES;
 				GCC_ENABLE_CPP_RTTI = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					UNICODE,
 					_UNICODE,
@@ -416,6 +418,7 @@
 					unix,
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
+					_XCODE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
@@ -439,13 +442,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
@@ -453,6 +464,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -465,7 +477,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -481,13 +493,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
@@ -495,13 +515,14 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.cpp

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

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcproj

@@ -43,6 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="../../DesktopEditor/xml/build/vs2005;../../DesktopEditor/xml/libxml2/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -331,21 +332,17 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
+			Name="Common"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="OdfFileTest.cpp"
+				RelativePath="..\..\Common\OfficeFileFormatChecker.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Common\OfficeFileFormatChecker2.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\Common\3dParty\pole\pole.cpp"
@@ -396,6 +393,18 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
+		<File
+			RelativePath="OdfFileTest.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

ASCOfficeOdfFile/formulasconvert/formulasconvert.h

@@ -32,6 +32,7 @@
 #pragma once
 
 #include <string>
+#include <vector>
 #include "../include/cpdoccore/CPScopedPtr.h"
 
 namespace cpdoccore {
@@ -51,12 +52,15 @@ public:
     
     // $Лист1.$A$1 -> Лист1!$A$1
 	std::wstring convert_named_ref(std::wstring const & expr, bool withTableName = true, std::wstring separator = L" ");
+	std::wstring get_table_name();
 
 	//a-la convert without check formula
     std::wstring convert_named_expr(std::wstring const & expr, bool withTableName = true);
 	
 	//Sheet2.C3:Sheet2.C19 -> Sheet2!C3:C19
     std::wstring convert_chart_distance(std::wstring const & expr);
+
+	void split_distance_by(const std::wstring& expr, const std::wstring& by, std::vector<std::wstring>& out);
     
     std::wstring convert_ref(std::wstring const & expr);
 
@@ -87,9 +91,10 @@ public:
 	std::wstring convert_conditional_formula(std::wstring const & expr);
   
     // Лист1!$A$1 -> $Лист1.$A$1 
-    std::wstring convert_named_ref(std::wstring const & expr);
+    std::wstring convert_named_ref	(std::wstring const & expr);
+	std::wstring convert_named_formula(std::wstring const & expr);
 
-	std::wstring find_base_cell(std::wstring const & expr);
+	std::wstring get_table_name();
 
 	//Sheet2!C3:C19 -> Sheet2.C3:Sheet2.C19 
     std::wstring convert_chart_distance(std::wstring const & expr);

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

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

ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp

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

ASCOfficeOdfFile/include/cpdoccore/odf/odf_document.h

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

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -105,6 +105,7 @@ SOURCES += \
     ../src/odf/table_calculation_settings.cpp \
     ../src/odf/table_docx.cpp \
     ../src/odf/table_named_expressions.cpp \
+    ../src/odf/table_data_pilot_tables.cpp \
     ../src/odf/table_pptx.cpp \
     ../src/odf/table_xlsx.cpp \
     ../src/odf/templates.cpp \
@@ -209,6 +210,14 @@ SOURCES += \
     ../src/odf/datatypes/wrapoption.cpp \
     ../src/odf/datatypes/writingmode.cpp \
     ../src/odf/datatypes/xlink.cpp \
+    ../src/odf/datatypes/chartlabelposition.cpp \
+    ../src/odf/datatypes/grandtotal.cpp \
+    ../src/odf/datatypes/membertype.cpp \
+    ../src/odf/datatypes/tabletype.cpp \
+    ../src/odf/datatypes/tableorientation.cpp \
+    ../src/odf/datatypes/tablefunction.cpp \
+    ../src/odf/datatypes/tableorder.cpp \
+    ../src/odf/datatypes/dategroup.cpp \
     ../src/docx/xlsx_conditionalFormatting.cpp \
     ../src/docx/xlsx_dxfs.cpp \
     ../src/docx/docx_content_type.cpp \
@@ -278,6 +287,7 @@ SOURCES += \
     ../src/docx/xlsx_table_metrics.cpp \
     ../src/docx/xlsx_table_state.cpp \
     ../src/docx/xlsx_textcontext.cpp \
+    ../src/docx/xlsx_pivots_context.cpp \
     ../src/docx/xlsx_utils.cpp \
     ../src/docx/xlsx_xf.cpp
 }
@@ -462,6 +472,8 @@ HEADERS += \
     ../src/odf/datatypes/wrapoption.h \
     ../src/odf/datatypes/writingmode.h \
     ../src/odf/datatypes/xlink.h \
+    ../src/odf/datatypes/chartlabelposition.h \
+    ../src/odf/datatypes/grandtotal.h \
     ../src/docx/docx_content_type.h \
     ../src/docx/docx_conversion_context.h \
     ../src/docx/docx_conversion_state.h \

ASCOfficeOdfFile/linux/odffilereaderlib_odf.cpp

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

ASCOfficeOdfFile/linux/odffilereaderlib_odf_datatypes.cpp

@@ -119,3 +119,11 @@
 #include "../src/odf/datatypes/wrapoption.cpp"
 #include "../src/odf/datatypes/writingmode.cpp"
 #include "../src/odf/datatypes/xlink.cpp"
+#include "../src/odf/datatypes/chartlabelposition.cpp"
+#include "../src/odf/datatypes/grandtotal.cpp"
+#include "../src/odf/datatypes/membertype.cpp"
+#include "../src/odf/datatypes/tabletype.cpp"
+#include "../src/odf/datatypes/tableorientation.cpp"
+#include "../src/odf/datatypes/tablefunction.cpp"
+#include "../src/odf/datatypes/tableorder.cpp"
+#include "../src/odf/datatypes/dategroup.cpp"

ASCOfficeOdfFile/linux/odffilereaderlib_oox.cpp

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

ASCOfficeOdfFile/src/ConvertOO2OOX.cpp

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

ASCOfficeOdfFile/src/docx/docx_content_type.cpp

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

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -46,7 +46,6 @@
 #include "../odf/style_text_properties.h"
 #include "../odf/style_table_properties.h"
 #include "../odf/style_graphic_properties.h"
-#include "../odf/datatypes/style_ref.h"
 
 #include "docx_package.h"
 #include "oox_rels.h"
@@ -97,7 +96,7 @@ void text_tracked_context::start_change (std::wstring id)
 {
 	current_state_.clear();
 
-	current_state_.id	= id;
+	current_state_.id = id;
 }
 void text_tracked_context::end_change ()
 {
@@ -189,7 +188,7 @@ std::wstring styles_map::get(const std::wstring & Name, odf_types::style_family:
     }
     else
     {
-        const std::wstring id = std::wstring(L"style") + boost::lexical_cast<std::wstring>(count_++);
+        const std::wstring id = std::wstring(L"style") + std::to_wstring(count_++);
         map_.insert(std::make_pair(n, id));
         return id;        
     }
@@ -379,7 +378,8 @@ void docx_conversion_context::start_document()
 	output_stream() << L"xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" "; 
 	output_stream() << L"xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" "; 
 	output_stream() << L"xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" "; 
-	output_stream() << L"xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" "; 
+	output_stream() << L"xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" ";
+	output_stream() << L"xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" ";
 	output_stream() << L"mc:Ignorable=\"w14 wp14\">";
 
 
@@ -407,14 +407,12 @@ void docx_conversion_context::end_document()
    
 	output_document_->get_word_files().set_notes(notes_context_);
 ////////////////////////	
-	int count = 0;
-    BOOST_FOREACH(const oox_chart_context_ptr& chart, charts_)
+	for (size_t i = 0; i < charts_.size(); i++)
     {
-		count++;
 		package::chart_content_ptr content = package::chart_content::create();
 
-		chart->serialize(content->content());
-		chart->dump_rels(content->get_rel_file()->get_rels());
+		charts_[i]->serialize(content->content());
+		charts_[i]->dump_rels(content->get_rel_file()->get_rels());
 
 		output_document_->get_word_files().add_charts(content);
 	
@@ -581,10 +579,10 @@ mc:Ignorable=\"w14 wp14\">";
         strm << L"</w:abstractNum>";
     }
 
-    BOOST_FOREACH(int numId, numIds)
+	for (size_t i = 0; i < numIds.size(); i++)
     {
-        strm << L"<w:num w:numId=\"" << numId << L"\" >";
-        strm << L"<w:abstractNumId w:val=\"" << numId << "\" />";
+        strm << L"<w:num w:numId=\"" << numIds[i] << L"\" >";
+        strm << L"<w:abstractNumId w:val=\"" << numIds[i] << "\" />";
         strm << L"</w:num>";    
     }
 
@@ -802,7 +800,7 @@ bool docx_conversion_context::process_page_properties(std::wostream & strm)
 
 		if (page_layout_instance_) 
 		{
-				page_layout_instance_->docx_convert_serialize(strm, *this);
+				page_layout_instance_->docx_serialize(strm, *this);
 		}
 		else
 		{
@@ -1061,7 +1059,7 @@ void docx_conversion_context::start_list_item(bool restart)
     if (restart && !list_style_stack_.empty())
     {
         const std::wstring curStyleName = current_list_style();
-        const std::wstring newStyleName = curStyleName + boost::lexical_cast<std::wstring>(new_list_style_number_++);
+        const std::wstring newStyleName = curStyleName + std::to_wstring(new_list_style_number_++);
         list_style_renames_[curStyleName] = newStyleName;
 
         odf_reader::list_style_container & lists = root()->odf_context().listStyleContainer();
@@ -1196,7 +1194,7 @@ void docx_conversion_context::process_headers_footers()
     // проходим по всем page layout
     BOOST_FOREACH(const odf_reader::style_master_page* page, pageLayouts.master_pages())
     {
-        const std::wstring & styleName = page->style_master_page_attlist_.style_name_.get_value_or( odf_types::style_ref(L"") ).style_name();
+        const std::wstring & styleName = page->attlist_.style_name_.get_value_or( L"" );
         const std::wstring masterPageNameLayout =context.pageLayoutContainer().page_layout_name_by_style(styleName);
         add_page_properties(masterPageNameLayout);
 		
@@ -1241,7 +1239,7 @@ std::wstring notes_context::add(const std::wstring & Content, const std::wstring
 std::wstring notes_context::next_id()
 {
     instances_map & map = (type_ == odf_types::noteclass::Endnote) ? instances_endnotes_ : instances_footnotes_;
-    const std::wstring s = boost::lexical_cast<std::wstring>(map.size() + 1);
+    const std::wstring s = std::to_wstring(map.size() + 1);
     return s;        
 }
 
@@ -1287,19 +1285,20 @@ void docx_conversion_context::start_text_changes (std::wstring id)
 										L" w:author=\""	+ state.author	+ L"\"" ;
 
 		finish_run();
-		state.active = true;
+		state.active		= true;
+		state.in_drawing	= get_drawing_state_content();
 		
 		if (state.type	== 1)
 		{
 
-			output_stream() << L"<w:ins" << format_change << L" w:id=\"" << boost::lexical_cast<std::wstring>(current_id_changes++) <<  L"\">";
+			output_stream() << L"<w:ins" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) <<  L"\">";
 		}
 		
 		if (state.type	== 2)
 		{
 			for (size_t i = 0 ; i < state.content.size(); i++)
 			{
-				output_stream() << L"<w:del" << format_change << L" w:id=\"" << boost::lexical_cast<std::wstring>(current_id_changes++) <<  L"\">";
+				output_stream() << L"<w:del" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) <<  L"\">";
 
 				output_stream() << state.content[i];
 
@@ -1331,7 +1330,7 @@ void docx_conversion_context::start_changes()
 		std::wstring change_attr;
 		change_attr += L" w:date=\""	+ state.date	+ L"\"";
 		change_attr += L" w:author=\""	+ state.author	+ L"\"";
-		change_attr += L" w:id=\""		+ boost::lexical_cast<std::wstring>(current_id_changes++) + L"\"";
+		change_attr += L" w:id=\""		+ std::to_wstring(current_id_changes++) + L"\"";
 
 		if (state.type	== 1)
 		{
@@ -1421,6 +1420,9 @@ void docx_conversion_context::end_changes()
 		if (state.type	== 0)	continue; //unknown change ... libra format change skip
 		if (state.type	== 3)	continue;
 		if (!state.active)		continue;
+		
+		if (state.in_drawing != get_drawing_state_content())
+			continue;
 
 		if (state.type	== 1)	output_stream() << L"</w:ins>";
 		if (state.type	== 2)	output_stream() << L"</w:del>";

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -53,7 +53,6 @@ namespace cpdoccore {
 
 	namespace odf_types
 	{
-		class style_ref;
 		class length_or_percent;
 	}
 	namespace odf_reader 
@@ -493,10 +492,11 @@ public:
 		std::wstring				id;
 		std::wstring				author;
 		std::wstring				date;
-		int							type;
+		int							type = 0;
 		std::wstring				style_name;
 		std::vector<std::wstring>	content;	//delete elements		
-		bool						active;
+		bool						active = false;
+		bool						in_drawing = false;
 	
 		void clear()
 		{
@@ -506,6 +506,7 @@ public:
 			date.clear();
 			content.clear();
 			active = false;
+			in_drawing = false;
 		}
 	};
 	std::wstring dumpPPr_;

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -317,7 +317,8 @@ void docx_serialize_common(std::wostream & strm, _docx_drawing & val)
 		{
 			CP_XML_ATTR(L"name",	val.name);
 			CP_XML_ATTR(L"id",		val.id + 1);
-			oox_serialize_hlink(CP_XML_STREAM(), val.hlinks);
+			
+			oox_serialize_action(CP_XML_STREAM(), val.action);
 		}
 
 		CP_XML_NODE(L"wp:cNvGraphicFramePr")
@@ -391,8 +392,11 @@ void docx_serialize_wps(std::wostream & strm, _docx_drawing & val)
 				{
 					CP_XML_NODE(L"wp:extent")
 					{
-						CP_XML_ATTR(L"cx", val.cx);
-						CP_XML_ATTR(L"cy", val.cy);
+						if (val.cx > 0 || val.cy > 0)
+						{
+							CP_XML_ATTR(L"cx", val.cx);
+							CP_XML_ATTR(L"cy", val.cy);
+						}
 
 						serialize_null_extent(CP_XML_STREAM());
 					}
@@ -462,10 +466,13 @@ void docx_serialize_wps(std::wostream & strm, _docx_drawing & val)
 							}
 						}
 					}
-					CP_XML_NODE(L"wp:extent")
+					if (val.cx > 0 || val.cy > 0)
 					{
-						CP_XML_ATTR(L"cx", val.cx); 
-						CP_XML_ATTR(L"cy", val.cy);
+						CP_XML_NODE(L"wp:extent")
+						{
+							CP_XML_ATTR(L"cx", val.cx); 
+							CP_XML_ATTR(L"cy", val.cy);
+						}
 					}
 
 					serialize_wrap(CP_XML_STREAM(), val);
@@ -529,7 +536,7 @@ mso-position-vertical-relative:text;";
 				strStyle += L"margin-top:"  + boost::lexical_cast<std::wstring>(val.y / 12700.) + L"pt;";
 				strStyle += L"width:"		+ boost::lexical_cast<std::wstring>(val.cx / 12700.) + L"pt;"; 
 				strStyle += L"height:"		+ boost::lexical_cast<std::wstring>(val.cy / 12700.) + L"pt;"; 
-				strStyle += L"z-index:"		+ boost::lexical_cast<std::wstring>(0xF000800 - val.id);
+				strStyle += L"z-index:"		+ std::to_wstring(0xF000800 - val.id);
 			
 				CP_XML_ATTR(L"id",				L"Rect"		+ std::to_wstring(val.id));
 				CP_XML_ATTR(L"o:spid",			L"_x0000_s" + std::to_wstring(1024 + val.id));

ASCOfficeOdfFile/src/docx/docx_package.cpp

@@ -30,6 +30,7 @@
  *
  */
 
+#include <boost/foreach.hpp>
 
 #include "docx_package.h"
 #include "docx_conversion_context.h"
@@ -218,26 +219,25 @@ void docx_charts_files::write(const std::wstring & RootPath)
 
     size_t count = 0;
 
-    BOOST_FOREACH(const chart_content_ptr & item, charts_)
+	for (int i = 0 ; i < charts_.size(); i++)
     {
-        if (item)
-        {
-            count++;
-            const std::wstring fileName = std::wstring(L"chart") + boost::lexical_cast<std::wstring>(count) + L".xml";
-			const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
-           
-			content_type_content * contentTypes = get_main_document()->get_content_types_file().content();           
-            contentTypes->add_override(std::wstring(L"/word/charts/") + fileName, kWSConType);
+        if (!charts_[i]) continue;
+        
+		count++;
+        const std::wstring fileName = std::wstring(L"chart") + std::to_wstring(count) + L".xml";
+		const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
+       
+		content_type_content * contentTypes = get_main_document()->get_content_types_file().content();           
+        contentTypes->add_override(std::wstring(L"/word/charts/") + fileName, kWSConType);
 
-            package::simple_element(fileName, item->str()).write(path);
-			
-			rels_files relFiles;
+        package::simple_element(fileName, charts_[i]->str()).write(path);
+		
+		rels_files relFiles;
 
-			item->get_rel_file()->set_file_name(fileName + L".rels");
-			    
-			relFiles.add_rel_file(item->get_rel_file());
-			relFiles.write(path);
-        }
+		charts_[i]->get_rel_file()->set_file_name(fileName + L".rels");
+		    
+		relFiles.add_rel_file(charts_[i]->get_rel_file());
+		relFiles.write(path);
     }
 }
 ///////////////////////////
@@ -307,6 +307,7 @@ namespace
 			content << L"<w:" << Node <<    L"s \
 								xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
 								xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
+								xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
 								xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
 								xmlns:w10=\"urn:schemas-microsoft-com:office:word\" \
 								xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
@@ -318,6 +319,7 @@ namespace
 								xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
 								xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
 								xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
+								xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
 								xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" >";
 
 							//mc:Ignorable=\"w14 wp14\" 

ASCOfficeOdfFile/src/docx/docx_package.h

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

ASCOfficeOdfFile/src/docx/docx_table_context.cpp

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

ASCOfficeOdfFile/src/docx/drawing_object_description.h

@@ -49,6 +49,8 @@ struct _rect
 
 struct drawing_object_description
 {
+	bool									bNotes_;
+
 	oox::RelsType							type_;
 
 	std::wstring							name_;	
@@ -60,7 +62,9 @@ struct drawing_object_description
     double									anchor_x_;
     double									anchor_y_;
 
+	_action_desc							action_;
 	std::vector<_hlink_desc>				hlinks_;
+
 	std::vector<odf_reader::_property>		additional_;	//shape properties
 	
 	std::wstring							xlink_href_;	//ссылка на внешний объект

ASCOfficeOdfFile/src/docx/headers_footers.cpp

@@ -39,13 +39,13 @@ namespace oox {
 
 std::wstring headers_footers::create_id(size_t i)
 {
-    return std::wstring(L"rHFId") + boost::lexical_cast<std::wstring>(i); 
+    return std::wstring(L"rHFId") + std::to_wstring(i); 
 }
 
 std::wstring headers_footers::create_name(size_t i, headers_footers::Type _Type)
 {
     return ((_Type == header || _Type == headerLeft || _Type == headerFirst) ?  std::wstring(L"header") : std::wstring(L"footer") )
-        + boost::lexical_cast<std::wstring>(i) + L".xml";
+        + std::to_wstring(i) + L".xml";
 }
 
 std::wstring headers_footers::add(const std::wstring & StyleName,
@@ -64,9 +64,10 @@ std::wstring headers_footers::add(const std::wstring & StyleName,
 	}
     instance_ptr inst = instance_ptr( new instance(id, Content, type, name) );
   
-	BOOST_FOREACH(const relationship & r, _rels.relationships())
+	std::vector<relationship> & rels = _rels.relationships();
+	for (size_t i = 0; i < rels.size(); i++)
     {
-		inst->rels_.add(r);
+		inst->rels_.add(rels[i]);
 	}
     instances_[StyleName].push_back(inst);
 	return id;

ASCOfficeOdfFile/src/docx/hyperlinks.cpp

@@ -33,9 +33,6 @@
 #include "hyperlinks.h"
 #include "oox_rels.h"
 
-#include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
-
 #include <cpdoccore/xml/utils.h>
 
 namespace cpdoccore { 
@@ -44,7 +41,8 @@ namespace oox {
 hyperlinks::_ref  hyperlinks::last()
 {
 	_ref r={};
-	if (hrefs_.size()>0)
+	
+	if (!hrefs_.empty())
 		r = hrefs_.back();
 
 	return r;
@@ -52,9 +50,9 @@ hyperlinks::_ref  hyperlinks::last()
 
 std::wstring hyperlinks::add(const std::wstring & href, _type_place type_place, bool drawing)
 {
-	std::wstring id = std::wstring(L"rHpId") + boost::lexical_cast<std::wstring>(hrefs_.size()+1);
+	std::wstring id = std::wstring(L"rHpId") + std::to_wstring(hrefs_.size() + 1);
 	
-	_ref r ={xml::utils::replace_text_to_xml(href), type_place, drawing, id, false};
+	_ref r = {xml::utils::replace_text_to_xml(href), type_place, drawing, id};
 	
 	hrefs_.push_back(r);
 
@@ -65,14 +63,14 @@ std::wstring hyperlinks::add(const std::wstring & href, _type_place type_place,
 void hyperlinks::dump_rels(rels & Rels, _type_place type)
 {
     size_t i = 0;
-    BOOST_FOREACH(_ref & elm, hrefs_)
+    for (size_t i = 0; i < hrefs_.size(); i++)
     {
- 		if (elm.used_rels)continue; // уже использовали этот релс
+ 		if (hrefs_[i].used_rels)continue; // уже использовали этот релс
 
-		if (elm.type_place == type)
+		if (hrefs_[i].type_place == type)
 		{
-			Rels.add( relationship(elm.id, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", elm.href, L"External" ) );
-			elm.used_rels = true;
+			Rels.add( relationship(hrefs_[i].id, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", hrefs_[i].href, L"External" ) );
+			hrefs_[i].used_rels = true;
 		}
     }
 }

ASCOfficeOdfFile/src/docx/measuredigits.cpp

@@ -71,7 +71,7 @@ std::pair<float, float> GetMaxDigitSizePixelsImpl(const std::wstring & fontName,
 
    // for (int i = 0; i <= 9; ++i)
     {
-		//if (FALSE == (hr = pFontManager->LoadString2( boost::lexical_cast<std::wstring>(i), 0, 0)))
+		//if (FALSE == (hr = pFontManager->LoadString2( std::to_wstring(i), 0, 0)))
 		//	return std::pair<float, float>(7,8);
 
 		if (FALSE == (hr = pFontManager->LoadString2( L"xxxxx" , 0, 0)))

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -33,9 +33,6 @@
 #include "mediaitems.h"
 
 #include <boost/regex.hpp>
-#include <boost/foreach.hpp>
-#include <boost/algorithm/string/case_conv.hpp>
-#include <boost/lexical_cast.hpp>
 
 #include <cpdoccore/xml/utils.h>
 
@@ -92,12 +89,18 @@ std::wstring static get_default_file_name(RelsType type)
         return L"image";
     case typeChart:
         return L"chart";
-    case typeMedia:
-        return L"media";
     case typeMsObject:
        return L"msObject";
 	case typeOleObject:
        return L"oleObject";
+    case typeMedia:
+        return L"media";
+	case typeSlide:
+        return L"slide";
+	case typeVideo:
+        return L"video"; 
+	case typeAudio:
+        return L"audio";
 	default:
         return L"";
     }
@@ -140,10 +143,9 @@ std::wstring mediaitems::create_file_name(const std::wstring & uri, RelsType typ
 	if (type == typeOleObject && sExt.empty())
 		sExt = L".bin";
    
-	return get_default_file_name(type) + boost::lexical_cast<std::wstring>(Num) + sExt;
+	return get_default_file_name(type) + std::to_wstring(Num) + sExt;
 }
-
-std::wstring mediaitems::detectImageFileExtension(std::wstring &fileName)
+std::wstring mediaitems::detectImageFileExtension(const std::wstring &fileName)
 {
 	CFile file;
 
@@ -166,8 +168,7 @@ std::wstring mediaitems::detectImageFileExtension(std::wstring &fileName)
 
 std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, bool & isInternal, std::wstring & ref)
 {
-    bool isMediaInternal = is_internal(href, odf_packet_);
-  
+	bool isMediaInternal = true;
 	std::wstring sub_path = L"media/";
 	
 	std::wstring inputFileName;
@@ -175,16 +176,26 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	{
 		sub_path = L"charts/";
 	}
-	if ( type == typeMsObject || type == typeOleObject)
+	else if ( type == typeMsObject || type == typeOleObject)
 	{
 		sub_path = L"embeddings/";
 	}
+	else 
+	{
+		isMediaInternal = is_internal(href, odf_packet_);
+		if (href.empty() && type == typeImage)
+			return L"";
+	}
+	
 	int number=0;
 	
 		 if ( type == typeChart)		number = count_charts	+ 1;
 	else if ( type == typeImage)		number = count_image	+ 1;
 	else if ( type == typeShape)		number = count_shape	+ 1;
 	else if ( type == typeMedia)		number = count_media	+ 1;
+	else if ( type == typeAudio)		number = count_audio	+ 1;
+	else if ( type == typeVideo)		number = count_video	+ 1;
+	else if ( type == typeSlide)		number = count_slide	+ 1;
 	else if ( type == typeMsObject ||
 			  type == typeOleObject)	number = count_object	+ 1;
 	else
@@ -198,9 +209,9 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	if ( type == typeChart) outputPath = outputPath + L".xml";
 
 	std::wstring id;
-    for (int i = 0 ; i < items_.size(); i++)
+    for (size_t i = 0 ; i < items_.size(); i++)
     {
-		if (items_[i].href == inputPath)
+		if ((items_[i].href == inputPath && !inputPath.empty()) || (items_[i].type == type && inputPath.empty()))
 		{
 			id			= items_[i].Id;
 			outputPath  = items_[i].outputName;
@@ -217,7 +228,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	{
 		if ( type == typeChart)
 		{
-			id = std::wstring(L"chId") + boost::lexical_cast<std::wstring>(count_charts + 1);
+			id = std::wstring(L"chId") + std::to_wstring(count_charts + 1);
 			count_charts++;
 		}
 		else if ( type == typeImage)
@@ -228,19 +239,34 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 				outputPath = outputPath.substr(0, n_svm) + L".png"; 
 			}
 //------------------------------------------------
-			if (inputFileName.empty()) return L"";
+			//if (inputFileName.empty()) return L"";  - Book 27.ods - пустые линки на картинки
 
-			id = std::wstring(L"picId") + boost::lexical_cast<std::wstring>(count_image + 1);
+			id = std::wstring(L"picId") + std::to_wstring(count_image + 1);
 			count_image++;
 		}
 		else if ( type == typeMsObject || type == typeOleObject)
 		{
-			id = std::wstring(L"objId") + boost::lexical_cast<std::wstring>(count_object + 1);
+			id = std::wstring(L"objId") + std::to_wstring(count_object + 1);
 			count_object++;
 		}
+		else if ( type == typeAudio)
+		{
+			id = std::wstring(L"aId") + std::to_wstring(count_audio + 1);
+			count_audio++;
+		}
+		else if ( type == typeVideo)
+		{
+			id = std::wstring(L"vId") + std::to_wstring(count_video + 1);
+			count_video++;
+		}
+		else if ( type == typeMedia)
+		{
+			id = std::wstring(L"mId") + std::to_wstring(count_media + 1);
+			count_media++;
+		}
 		else
 		{
-			id = std::wstring(L"rId") + boost::lexical_cast<std::wstring>(count_shape + 1);	
+			id = std::wstring(L"rId") + std::to_wstring(count_shape + 1);	
 			count_shape++;
 		}
 		

ASCOfficeOdfFile/src/docx/mediaitems.h

@@ -31,11 +31,10 @@
  */
 #pragma once
 
-#include <vector>
-#include <string>
-
 #include "oox_rels.h"
 
+#include "../../../../Common/DocxFormat/Source/XML/Utils.h"
+
 namespace cpdoccore { 
 namespace oox {
 
@@ -50,6 +49,9 @@ public:
  		count_tables	= 0;
  		count_media		= 0;
 		count_object	= 0;
+ 		count_audio		= 0;
+ 		count_video		= 0;
+ 		count_slide		= 0;
 	}
 
     struct item 
@@ -74,6 +76,9 @@ public:
 	size_t count_charts;
 	size_t count_image;
 	size_t count_media;
+	size_t count_audio;
+	size_t count_video;
+	size_t count_slide;
 	size_t count_shape;
 	size_t count_tables;
 	size_t count_object;
@@ -88,20 +93,48 @@ public:
 	{
 		switch (type)
 		{
-		case typeImage:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
-		case typeChart:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
-		case typeMsObject:	return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
-		case typeOleObject:	return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
-		case typeHyperlink:	return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
-		default:
-			return L"";
+			case typeImage:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
+			case typeChart:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
+			case typeMsObject:	return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
+			case typeOleObject:	return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
+			case typeHyperlink:	return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
+			case typeMedia:		return L"http://schemas.microsoft.com/office/2007/relationships/media";
+			case typeAudio:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/audio";
+			case typeVideo:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/video";
+			case typeSlide:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide";
+			default:
+				return L"";
 		}
 	}
+	static RelsType detectMediaType(const std::wstring & fileName)
+	{
+		int pos = fileName.rfind(L".");
 
+		std::wstring sExt = (pos >=0 ? fileName.substr(pos + 1) : L"");
+
+		if (sExt.empty()) return typeMedia;
+
+		sExt = XmlUtils::GetLower(sExt);
+
+		if (sExt == L"wmv") return typeVideo;
+		if (sExt == L"avi") return typeVideo;
+		if (sExt == L"wmv") return typeVideo;
+		if (sExt == L"wma") return typeAudio;
+		if (sExt == L"wav") return typeAudio;
+		
+		if (sExt == L"mp3") return typeAudio;
+		if (sExt == L"m4a") return typeAudio;
+		if (sExt == L"m4v") return typeVideo;
+		if (sExt == L"mp4") return typeVideo;
+		if (sExt == L"mov") return typeVideo;
+		if (sExt == L"mkv") return typeVideo;
+
+		return typeMedia;
+	}
 private:
 	std::wstring create_file_name			(const std::wstring & uri, RelsType type, bool & isInternal, size_t Num);
-	std::wstring detectImageFileExtension	(std::wstring &fileName);
-    
+	std::wstring detectImageFileExtension	(const std::wstring &fileName);
+   
 	items_array		items_;
     std::wstring	odf_packet_;
 

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

@@ -31,10 +31,8 @@
  */
 
 
-
 #include "oox_chart_axis.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include <boost/foreach.hpp>
 
 #include "oox_title.h"
 #include "oox_chart_shape.h"
@@ -181,18 +179,18 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 			}
 		}
 
-		BOOST_FOREACH(odf_reader::chart::axis::grid  & g, content_.grids_)
+		for (size_t i = 0; i < content_.grids_.size(); i++)
 		{
 			_oox_fill fill_null;
-			shape.set(g.graphic_properties_, fill_null);
+			shape.set(content_.grids_[i].graphic_properties_, fill_null);
 			
-			if (g.type_ == odf_reader::chart::axis::grid::major)
+			if (content_.grids_[i].type_ == odf_reader::chart::axis::grid::major)
 			{
 				CP_XML_NODE(L"c:majorGridlines")
 				{
 					shape.oox_serialize(CP_XML_STREAM());
 				}
-				odf_reader::GetProperty(content_.properties_,L"display_label",boolVal);
+				odf_reader::GetProperty(content_.properties_, L"display_label", boolVal);
 				if ((boolVal == true) && (boolVal.get()==true))
 				{
 					CP_XML_NODE(L"c:majorTickMark")
@@ -201,7 +199,7 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 					}
 				}
 			}
-			if (g.type_ == odf_reader::chart::axis::grid::minor)
+			if (content_.grids_[i].type_ == odf_reader::chart::axis::grid::minor)
 			{
 				CP_XML_NODE(L"c:minorGridlines")
 				{
@@ -234,11 +232,11 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 
 		oox_serialize_default_text(_Wostream, content_.text_properties_);
 		
-		BOOST_FOREACH(int const & ii, cross_id_)
+		for (size_t i = 0; i < cross_id_.size(); i++)
 		{
 			CP_XML_NODE(L"c:crossAx")
 			{
-				CP_XML_ATTR(L"val", ii);
+				CP_XML_ATTR(L"val", cross_id_[i]);
 			}
 		}
 

ASCOfficeOdfFile/src/docx/oox_chart_context.cpp

@@ -118,6 +118,23 @@ void oox_chart_context::serialize(std::wostream & strm)
 			{
 				CP_XML_ATTR(L"val",L"en-US");
 			}
+
+			if (pivot_source_.empty() == false)
+			{
+				set_cache_only(true);
+
+				CP_XML_NODE(L"c:pivotSource")
+				{
+				  CP_XML_NODE(L"c:name")
+				  {
+					  CP_XML_STREAM() << pivot_source_;
+				  }
+				  CP_XML_NODE(L"c:fmtId")
+				  {
+					  CP_XML_ATTR(L"val", 0);
+				  }
+				}
+			}
 			CP_XML_NODE(L"c:chart")
 			{
 				if (plot_area_.current_chart_->is3D_)
@@ -148,10 +165,42 @@ void oox_chart_context::serialize(std::wostream & strm)
 			shape.set(graphic_properties_, fill_);
 			shape.oox_serialize(CP_XML_STREAM());
 	
-
+			if (pivot_source_.empty() == false)
+			{
+				CP_XML_NODE(L"c:extLst")
+				{
+					CP_XML_NODE(L"c:ext")
+					{
+						CP_XML_ATTR(L"uri", L"{781A3756-C4B2-4CAC-9D66-4F8BD8637D16}");
+						CP_XML_ATTR(L"xmlns:c14", L"http://schemas.microsoft.com/office/drawing/2007/8/2/chart");
+						CP_XML_NODE(L"c14:pivotOptions")
+						{
+							CP_XML_NODE(L"c14:dropZoneFilter")
+							{
+								CP_XML_ATTR(L"val", 1);
+							}		
+							CP_XML_NODE(L"c14:dropZoneCategories")
+							{
+								CP_XML_ATTR(L"val", 1);
+							}
+							CP_XML_NODE(L"c14:dropZoneData")
+							{
+								CP_XML_ATTR(L"val", 1);
+							}
+							CP_XML_NODE(L"c14:dropZoneSeries")
+							{
+								CP_XML_ATTR(L"val", 1);
+							}
+							CP_XML_NODE(L"c14:dropZonesVisible")
+							{
+								CP_XML_ATTR(L"val", 1);
+							}
+						}
+					}
+				}
+			}
 		}
 	}
-
 }
 
 oox_chart_context::~oox_chart_context()
@@ -160,7 +209,7 @@ oox_chart_context::~oox_chart_context()
 
 void oox_chart_context::set_cache_only	(bool val)
 {
-	for (int i = 0 ; i < plot_area_.charts_.size(); i++)
+	for (size_t i = 0 ; i < plot_area_.charts_.size(); i++)
 	{
 		plot_area_.charts_[i]->set_cache_only(val);
 	}

ASCOfficeOdfFile/src/docx/oox_chart_context.h

@@ -63,6 +63,10 @@ public:
 	void serialize(std::wostream & strm);
 	void dump_rels(rels & Rels);
 	
+	void set_pivot_chart(const std::wstring &source)
+	{
+		pivot_source_ = source;
+	}
 	void set_title(odf_reader::chart::title & t)
 	{
 		title_.set_content(t);
@@ -130,6 +134,8 @@ private:
 	cpdoccore::oox::oox_plot_area		plot_area_;
 	cpdoccore::oox::oox_chart_legend	legend_;
 
+	std::wstring						pivot_source_;
+
 	std::vector<odf_reader::_property>	graphic_properties_;
 	_oox_fill							fill_;
 };

ASCOfficeOdfFile/src/docx/oox_chart_legend.cpp

@@ -31,7 +31,6 @@
  */
 
 
-#include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -37,6 +37,8 @@
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/style_text_properties.h"
 
+#include "xlsx_utils.h"
+
 #include "oox_chart_series.h"
 #include "../formulasconvert/formulasconvert.h"
 
@@ -55,6 +57,7 @@ oox_chart_series::oox_chart_series()
 
 	iSymbolMarkerType_	= 0;
 	bLocalTable_		= false;
+	labelPosEnabled_	= true;
 }
 void oox_chart_series::setName(std::wstring &value)
 {
@@ -67,8 +70,7 @@ void oox_chart_series::setFormula(int ind, std::wstring &value, std::wstring & f
 
 	if (ind == 0)
 	{
-		long res = value.find(L"local-table");
-		if (res >=0) return;
+		if (std::wstring::npos != value.find(L"local-table")) return;
 		
 		values_[ind].strRef_.formula	= converter.convert_chart_distance(value);
 		values_[ind].strRef_.present	= true;
@@ -76,8 +78,8 @@ void oox_chart_series::setFormula(int ind, std::wstring &value, std::wstring & f
 	}
 	else
 	{
-		long res = value.find(L"local-table");
-		if (res >=0 && !bLocalTable_ ) return; //в xlsx низя .... нужно сделать тогда отдельную  table.xml
+		if (std::wstring::npos != value.find(L"local-table") && !bLocalTable_ ) return; 
+			//в xlsx низя .... нужно сделать тогда отдельную  table.xml
 
 		values_[ind].numRef_.formula		= converter.convert_chart_distance(value);
 		values_[ind].numRef_.present		= true;
@@ -124,6 +126,7 @@ void oox_chart_series::parse_properties()
 		data_labels_->set_showCatName(*boolVal); 
 	}
 	odf_reader::GetProperty(content_.properties_, L"data-label-number", intVal);
+
 	if (intVal)
 	{
 		if (!data_labels_)	data_labels_ = oox_data_labels();
@@ -131,6 +134,13 @@ void oox_chart_series::parse_properties()
 		if (*intVal == 1)	data_labels_->set_showVal(true); 
 		if (*intVal == 2)	data_labels_->set_showPercent(true); 		
 	}
+	odf_reader::GetProperty(content_.properties_, L"label-position", intVal);
+	if (intVal && labelPosEnabled_)
+	{
+		if (!data_labels_)	data_labels_ = oox_data_labels();
+		
+		data_labels_->set_position(*intVal); 
+	}
 }
 void oox_chart_series::setValues(int ind, std::vector<std::wstring> & values)
 {
@@ -210,12 +220,24 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 		shape.set(content_.graphic_properties_, content_.fill_);
 		shape.oox_serialize(_Wostream);
 
-		for (int i=0; i < 5; i++)
+		for (int i = 0; i < 5; i++)
 		{
 			if (values_[i].present)
 			{
+				if (bLocalTable_)
+				{
+					if (values_[i].numRef_.present && values_[i].numRef_.num_cache_count == 0)
+					{
+						continue;
+					}
+					if (values_[i].strRef_.present && values_[i].strRef_.str_cache_count == 0 )
+					{
+						continue;
+					}
+				}			
 				CP_XML_NODE(values_[i].type)
 				{
+
 					if (values_[i].numRef_.present && !bLocalTable_)
 					{
 						CP_XML_NODE(L"c:numRef")
@@ -250,8 +272,11 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 											CP_XML_ATTR(L"idx", j);
 											double val = 0;
 
-											try { val = boost::lexical_cast<double>(v);}
-											catch(...){}			
+											if (oox::IsNumber(v))
+											{		
+												try { val = boost::lexical_cast<double>(v);}
+												catch(...){}	
+											}
 											CP_XML_NODE(L"c:v")
 											{
 												CP_XML_CONTENT(val);
@@ -285,8 +310,11 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 									CP_XML_ATTR(L"idx", j);
 									double val = 0;
 
-									try { val = boost::lexical_cast<double>(v);}
-									catch(...){}			
+									if (oox::IsNumber(v))
+									{			
+										try { val = boost::lexical_cast<double>(v);}
+										catch(...){}
+									}
 									CP_XML_NODE(L"c:v")
 									{
 										CP_XML_CONTENT(val);