x2t binary - fix convert ole without vml drawing

Feature/docbuilder

.gitignore

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

ASCOfficeDocFile/Common/FormatUtils.h

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

ASCOfficeDocFile/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);
@@ -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)
 	{

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/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/OfficeDrawing/PathParser.h

@@ -149,7 +149,14 @@ namespace DocFileFormat
 							point.y = guides[index].param3;
 						}
 					}
-
+					if ((size_t)point.y > 0xffff)
+					{
+						point.y &= 0xffff;
+					}
+					if ((size_t)point.x > 0xffff)
+					{
+						point.x &= 0xffff;
+					}
 					m_arPoints.push_back(point);
 				}
 			}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeContainer.h

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

ASCOfficeDocFile/DocDocxConverter/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/VMLShapeMapping.cpp

@@ -1905,13 +1905,13 @@ namespace DocFileFormat
 			switch (pSpa->wr)
 			{
 				case 0:
-				case 2:	wrapType = L"square";
-				case 1:	wrapType = L"topAndBottom";
-				case 3:	wrapType = L"through";
+				case 2:	wrapType = L"square";		break;
+				case 1:	wrapType = L"topAndBottom";	break;
+				case 3:	wrapType = L"through";		break;
 				case 4:
-				case 5:	wrapType = L"tight";
+				case 5:	wrapType = L"tight";		break;
 				default:
-						wrapType = L"none";
+						wrapType = L"none";			break;
 			}
 		}
 
@@ -2087,6 +2087,7 @@ namespace DocFileFormat
             nElemSize = 4;
             bTruncated = true;
         }
+        else nElemSize = 2;
 
         long dwSize = nElems * nElemSize;
 

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;
@@ -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,26 +483,27 @@ namespace DocFileFormat
 			delete storageOut;
 			return false;
 		}
+		DecryptStream( 0, "/", storageIn, storageOut, Decryptor);
 
-		std::list<std::string> listStream = storageIn->entries();
+		//std::list<std::string> listStream = storageIn->entries();
 
-		for (std::list<std::string>::iterator it = listStream.begin(); it != listStream.end(); it++)
-		{
-			if (storageIn->isDirectory(*it)) 
-			{
-				std::list<std::string> list_entry = storageIn->GetAllStreams(*it);
-				
-				for (std::list<std::string>::iterator it2 = list_entry.begin(); it2 != list_entry.end(); it2++)
-				{
-					DecryptStream(Decryptor, *it2, storageIn, storageOut);
-				}
-			}
-			else 
-			{
-				DecryptStream(Decryptor, *it, storageIn, storageOut);
-			}
+		//for (std::list<std::string>::iterator it = listStream.begin(); it != listStream.end(); it++)
+		//{
+		//	if (storageIn->isDirectory(*it)) 
+		//	{
+		//		std::list<std::string> list_entry = storageIn->GetAllStreams(*it);
+		//		
+		//		for (std::list<std::string>::iterator it2 = list_entry.begin(); it2 != list_entry.end(); it2++)
+		//		{
+		//			DecryptStream(Decryptor, *it2, storageIn, storageOut);
+		//		}
+		//	}
+		//	else 
+		//	{
+		//		DecryptStream(Decryptor, *it, storageIn, storageOut);
+		//	}
 
-		}
+		//}
 
 		storageOut->close();
 		delete storageOut;
@@ -512,34 +526,41 @@ namespace DocFileFormat
 		}
 		return true;
 	}
-	bool WordDocument::CopyStream (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)
 	{
-		POLE::Stream *stream = new POLE::Stream(storageIn, streamName);
-		if (!stream) return false;
-
-		stream->seek(0);
-		int sz_stream = stream->size();
+		std::list<std::string> entries, entries_sort;
+		entries = storageIn->entries( path );
 		
-		POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, sz_stream);
-		if (!streamNew) return false;
-
-		unsigned char* data_stream = new unsigned char[sz_stream];
-		stream->read(data_stream, sz_stream);
-
-		streamNew->write(data_stream, sz_stream);
-
-		RELEASEARRAYOBJECTS(data_stream);
-
-		streamNew->flush();
-				
-		delete streamNew;
-		delete stream;
-		
-		return true;
+		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(CRYPT::Decryptor* Decryptor, std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut)
+	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;
@@ -554,9 +575,9 @@ namespace DocFileFormat
 		stream->read(data_stream, size_stream);
 
 		unsigned char* data_store = NULL;
-		int size_data_store = 0;
+		int size_data_store = 0;		
 		
-		if ("WordDocument" == streamName)
+		if ( std::wstring::npos != streamName.find("WordDocument") )
 		{
 			size_data_store = 68;
 			data_store = new unsigned char[size_data_store];
@@ -659,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

@@ -99,17 +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);
-		bool CopyStream			(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;
@@ -162,7 +162,9 @@ namespace DocFileFormat
 		std::vector<int>							* AllPapxVector;// A vector to quick find in AllPapx
 
 		std::map<int, int>						PictureBulletsCPsMap;
+
 		std::vector<std::pair<int, int>>		BookmarkStartEndCPs;
+		std::vector<std::pair<int, int>>		AnnotStartEndCPs;
 
 		FileInformationBlock				* FIB;
 		StyleSheet							* Styles;					// The style sheet of the document
@@ -204,7 +206,10 @@ namespace DocFileFormat
 		Plex<SectionDescriptor>				*SectionPlex;						// A Plex containing all section descriptors
 	
 		Plex<BookmarkFirst>					*BookmarkStartPlex;
-		Plex<EmptyStructure>				*BookmarkEndPlex;		
+		Plex<EmptyStructure>				*BookmarkEndPlex;
+
+		Plex<BookmarkFirst>					*AnnotStartPlex;
+		Plex<EmptyStructure>				*AnnotEndPlex;
 
 		Plex<ListNumCache>					*ListPlex;
 		Plex<FieldCharacter>				*FieldsPlex;

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

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

ASCOfficeDocxFile2/BinReader/DocumentWriter.h

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

ASCOfficeDocxFile2/BinReader/FileWriter.h

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

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

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

ASCOfficeDocxFile2/BinReader/Readers.cpp

@@ -34,6 +34,14 @@
 
 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)
 {
 }
@@ -93,9 +101,9 @@ int Binary_HdrFtrTableReader::ReadHdrFtrItem(BYTE type, long length, void* poRes
 			Binary_DocumentTableReader oBinary_DocumentTableReader(m_oBufferedStream, m_oFileWriter, poHdrFtrItem->Header, m_pComments);
 			res = Read1(length, &Binary_HdrFtrTableReader::ReadHdrFtrItemContent, this, &oBinary_DocumentTableReader);
 
-            OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir +	FILE_SEPARATOR_STR + _T("word") + 
-																				FILE_SEPARATOR_STR + _T("_rels")+ 
-																				FILE_SEPARATOR_STR + poHdrFtrItem->m_sFilename + _T(".rels");
+            OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir +	FILE_SEPARATOR_STR + L"word" + 
+																				FILE_SEPARATOR_STR + L"_rels"+ 
+																				FILE_SEPARATOR_STR + poHdrFtrItem->m_sFilename + L".rels";
 
             m_oFileWriter.m_pDrawingConverter->SaveDstContentRels(fileRelsPath.GetPath());
 		}

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -273,6 +273,20 @@ private:
 		return res;
 	}
 };
+class Binary_VbaProjectTableReader : public Binary_CommonReader<Binary_VbaProjectTableReader>
+{
+	Writers::FileWriter&	m_oFileWriter;
+
+public:
+
+	Binary_VbaProjectTableReader (NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter)
+			: Binary_CommonReader(poBufferedStream), m_oFileWriter(oFileWriter)
+	{
+	}
+
+    int Read ();
+};
+
 class Binary_HdrFtrTableReader : public Binary_CommonReader<Binary_HdrFtrTableReader>
 {
 	Writers::FileWriter&	m_oFileWriter;
@@ -282,12 +296,12 @@ class Binary_HdrFtrTableReader : public Binary_CommonReader<Binary_HdrFtrTableRe
 	int						nCurHeaderType;
 public:
 	Writers::HeaderFooterWriter& m_oHeaderFooterWriter;
-public:
+	
 	Binary_HdrFtrTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, CComments* pComments);
     int Read();
-    int ReadHdrFtrContent(BYTE type, long length, void* poResult);
-    int ReadHdrFtrFEO(BYTE type, long length, void* poResult);
-    int ReadHdrFtrItem(BYTE type, long length, void* poResult);
+    int ReadHdrFtrContent	(BYTE type, long length, void* poResult);
+    int ReadHdrFtrFEO		(BYTE type, long length, void* poResult);
+    int ReadHdrFtrItem		(BYTE type, long length, void* poResult);
 	int ReadHdrFtrItemContent(BYTE type, long length, void* poResult);
 };
 class Binary_rPrReader : public Binary_CommonReader<Binary_rPrReader>
@@ -551,7 +565,7 @@ public:
                     std::wstring strXml;
                     HRESULT hRes = m_oFileWriter.m_pDrawingConverter->GetRecordXml(nCurPos, length, XMLWRITER_RECORD_TYPE_TEXT_FILL, XMLWRITER_DOC_TYPE_WORDART, strXml);
                     if (S_OK == hRes)
-                        orPr->Fill = _T("<w14:textFill>") + strXml + _T("</w14:textFill>");
+                        orPr->Fill = L"<w14:textFill>" + strXml + L"</w14:textFill>";
 					m_oBufferedStream.Seek(nCurPos + length);
 				}
 			}
@@ -560,35 +574,35 @@ public:
 			{
 				TrackRevision oDel;
 				oBinary_CommonReader2.ReadTrackRevision(length, &oDel);
-				orPr->Del = oDel.ToString(_T("w:del"));
+				orPr->Del = oDel.ToString(L"w:del");
 			}
 			break;
 		case c_oSerProp_rPrType::Ins:
 			{
 				TrackRevision oIns;
 				oBinary_CommonReader2.ReadTrackRevision(length, &oIns);
-				orPr->Ins = oIns.ToString(_T("w:ins"));
+				orPr->Ins = oIns.ToString(L"w:ins");
 			}
 			break;
 		case c_oSerProp_rPrType::MoveFrom:
 			{
 				TrackRevision oMoveFrom;
 				oBinary_CommonReader2.ReadTrackRevision(length, &oMoveFrom);
-				orPr->MoveFrom = oMoveFrom.ToString(_T("w:moveFrom"));
+				orPr->MoveFrom = oMoveFrom.ToString(L"w:moveFrom");
 			}
 			break;
 		case c_oSerProp_rPrType::MoveTo:
 			{
 				TrackRevision oMoveTo;
 				oBinary_CommonReader2.ReadTrackRevision(length, &oMoveTo);
-				orPr->MoveTo = oMoveTo.ToString(_T("w:moveTo"));
+				orPr->MoveTo = oMoveTo.ToString(L"w:moveTo");
 			}
 			break;
 		case c_oSerProp_rPrType::rPrChange:
 			{
 				TrackRevision oRPrChange;
 				res = Read1(length, &Binary_rPrReader::ReadrPrChange, this, &oRPrChange);
-				orPr->rPrChange = oRPrChange.ToString(_T("w:rPrChange"));
+				orPr->rPrChange = oRPrChange.ToString(L"w:rPrChange");
 			}
 			break;
 		default:
@@ -647,9 +661,9 @@ public:
 			{
 				BYTE contextualSpacing = m_oBufferedStream.GetUChar();
 				if(0 != contextualSpacing)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:contextualSpacing w:val=\"true\"/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:contextualSpacing w:val=\"true\"/>"));
 				else if(false == bDoNotWriteNullProp)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:contextualSpacing w:val=\"false\"/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:contextualSpacing w:val=\"false\"/>"));
             }break;
 		case c_oSerProp_pPrType::Ind:
 			{
@@ -657,9 +671,9 @@ public:
 				res = Read2(length, &Binary_pPrReader::ReadInd, this, &oTempWriter);
 				if(oTempWriter.GetCurSize() > 0)
 				{
-                    pCStringWriter->WriteString(std::wstring(_T("<w:ind")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:ind"));
 					pCStringWriter->Write(oTempWriter);
-                    pCStringWriter->WriteString(std::wstring(_T("/>")));
+                    pCStringWriter->WriteString(std::wstring(L"/>"));
 				}
 				break;
 			}
@@ -668,35 +682,35 @@ public:
 				BYTE jc = m_oBufferedStream.GetUChar();
 				switch(jc)
 				{
-                case align_Right: pCStringWriter->WriteString(std::wstring(_T("<w:jc w:val=\"right\" />")));break;
-                case align_Left: pCStringWriter->WriteString(std::wstring(_T("<w:jc w:val=\"left\" />")));break;
-                case align_Center: pCStringWriter->WriteString(std::wstring(_T("<w:jc w:val=\"center\" />")));break;
-                case align_Justify: pCStringWriter->WriteString(std::wstring(_T("<w:jc w:val=\"both\" />")));break;
+                case align_Right: pCStringWriter->WriteString(std::wstring(L"<w:jc w:val=\"right\" />"));break;
+                case align_Left: pCStringWriter->WriteString(std::wstring(L"<w:jc w:val=\"left\" />"));break;
+                case align_Center: pCStringWriter->WriteString(std::wstring(L"<w:jc w:val=\"center\" />"));break;
+                case align_Justify: pCStringWriter->WriteString(std::wstring(L"<w:jc w:val=\"both\" />"));break;
 				}				
             }break;
 		case c_oSerProp_pPrType::KeepLines:
 			{
 				BYTE KeepLines = m_oBufferedStream.GetUChar();
 				if(0 != KeepLines)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:keepLines/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:keepLines/>"));
 				else if(false == bDoNotWriteNullProp)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:keepLines w:val=\"false\"/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:keepLines w:val=\"false\"/>"));
             }break;
 		case c_oSerProp_pPrType::KeepNext:
 			{
 				BYTE KeepNext = m_oBufferedStream.GetUChar();
 				if(0 != KeepNext)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:keepNext/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:keepNext/>"));
 				else if(false == bDoNotWriteNullProp)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:keepNext w:val=\"false\"/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:keepNext w:val=\"false\"/>"));
             }break;
 		case c_oSerProp_pPrType::PageBreakBefore:
 			{
 				BYTE pageBreakBefore = m_oBufferedStream.GetUChar();
 				if(0 != pageBreakBefore)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:pageBreakBefore/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:pageBreakBefore/>"));
 				else if(false == bDoNotWriteNullProp)
-                    pCStringWriter->WriteString(std::wstring(_T("<w:pageBreakBefore w:val=\"false\"/>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:pageBreakBefore w:val=\"false\"/>"));
 				break;
 			}
 		case c_oSerProp_pPrType::Spacing:
@@ -705,7 +719,7 @@ public:
 				res = Read2(length, &Binary_pPrReader::ReadSpacing, this, &oSpacing);
 				if(oSpacing.bLine || oSpacing.bAfter || oSpacing.bAfterAuto || oSpacing.bBefore || oSpacing.bBeforeAuto)
 				{
-                    pCStringWriter->WriteString(std::wstring(_T("<w:spacing")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:spacing"));
 					BYTE bLineRule = linerule_Auto;
 					//проверяется bLine, а не bLineRule чтобы всегда писать LineRule, если есть w:line
 					if(oSpacing.bLine)
@@ -745,9 +759,9 @@ public:
 					if(oSpacing.bAfterAuto)
 					{
 						if(true == oSpacing.AfterAuto)
-                            pCStringWriter->WriteString(std::wstring(_T(" w:afterAutospacing=\"1\"")));
+                            pCStringWriter->WriteString(std::wstring(L" w:afterAutospacing=\"1\""));
 						else
-                            pCStringWriter->WriteString(std::wstring(_T(" w:afterAutospacing=\"0\"")));
+                            pCStringWriter->WriteString(std::wstring(L" w:afterAutospacing=\"0\""));
 					}
 					if(oSpacing.bBefore)
 					{
@@ -758,11 +772,11 @@ public:
 					if(oSpacing.bBeforeAuto)
 					{
 						if(true == oSpacing.BeforeAuto)
-                            pCStringWriter->WriteString(std::wstring(_T(" w:beforeAutospacing=\"1\"")));
+                            pCStringWriter->WriteString(std::wstring(L" w:beforeAutospacing=\"1\""));
 						else
-                            pCStringWriter->WriteString(std::wstring(_T(" w:beforeAutospacing=\"0\"")));
+                            pCStringWriter->WriteString(std::wstring(L" w:beforeAutospacing=\"0\""));
 					}
-                    pCStringWriter->WriteString(std::wstring(_T("/>")));
+                    pCStringWriter->WriteString(std::wstring(L"/>"));
 				}
 				break;
 			}
@@ -776,7 +790,7 @@ public:
 				}
 				else
 				{
-                    std::wstring sShd(_T("<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"auto\"/>"));
+                    std::wstring sShd(L"<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"auto\"/>");
 					pCStringWriter->WriteString(sShd);
 				}
 				break;
@@ -787,10 +801,10 @@ public:
 				if(0 != WidowControl)
 				{
 					if(false == bDoNotWriteNullProp)
-                        pCStringWriter->WriteString(std::wstring(_T("<w:widowControl/>")));
+                        pCStringWriter->WriteString(std::wstring(L"<w:widowControl/>"));
 				}
 				else
-                    pCStringWriter->WriteString(std::wstring(_T("<w:widowControl w:val=\"off\" />")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:widowControl w:val=\"off\" />"));
 				break;
 			}
 		case c_oSerProp_pPrType::Tab:
@@ -800,7 +814,7 @@ public:
 				size_t nLen = oTabs.m_aTabs.size();
 				if(nLen > 0)
 				{
-                    pCStringWriter->WriteString(std::wstring(_T("<w:tabs>")));
+                    pCStringWriter->WriteString(std::wstring(L"<w:tabs>"));
 					for(size_t i = 0; i < nLen; ++i)
 					{
 						Tab& oTab = oTabs.m_aTabs[i];
@@ -808,14 +822,14 @@ public:
                         std::wstring sVal;
 						switch(oTab.Val)
 						{
-                            case g_tabtype_right:   sVal=_T("right");   break;
-                            case g_tabtype_center:  sVal=_T("center");  break;
-                            case g_tabtype_clear:   sVal=_T("clear");   break;
-                            default:                sVal=_T("left");    break;
+                            case g_tabtype_right:   sVal = L"right";   break;
+                            case g_tabtype_center:  sVal = L"center";  break;
+                            case g_tabtype_clear:   sVal = L"clear";   break;
+                            default:                sVal = L"left";    break;
 						}
                         pCStringWriter->WriteString(L"<w:tab w:val=\"" + sVal + L"\" w:pos=\"" + std::to_wstring(nTab) + L"\"/>");
 					}
-                    pCStringWriter->WriteString(std::wstring(_T("</w:tabs>")));
+                    pCStringWriter->WriteString(std::wstring(L"</w:tabs>"));
 				}				
             }break;
 		case c_oSerProp_pPrType::ParaStyle:
@@ -826,9 +840,9 @@ public:
             }break;
 		case c_oSerProp_pPrType::numPr:
             {
-                pCStringWriter->WriteString(std::wstring(_T("<w:numPr>")));
+                pCStringWriter->WriteString(std::wstring(L"<w:numPr>"));
                 res = Read2(length, &Binary_pPrReader::ReadNumPr, this, poResult);
-                pCStringWriter->WriteString(std::wstring(_T("</w:numPr>")));
+                pCStringWriter->WriteString(std::wstring(L"</w:numPr>"));
             }break;
 		case c_oSerProp_pPrType::pPr_rPr:
 			{
@@ -871,6 +885,11 @@ public:
 				pCStringWriter->WriteString(oSectPr.Write());
                 pCStringWriter->WriteString(std::wstring(_T("</w:sectPr>")));
             }break;
+		case c_oSerProp_pPrType::outlineLvl:
+			{
+				long outlineLvl = m_oBufferedStream.GetLong();
+				pCStringWriter->WriteString(L"<w:outlineLvl w:val=\"" + std::to_wstring(outlineLvl) + L"\"/>");
+			}break;
 		default:
 			res = c_oSerConstants::ReadUnknown;
 			break;
@@ -2917,7 +2936,8 @@ class Binary_OtherTableReader : public Binary_CommonReader<Binary_OtherTableRead
 	Writers::FileWriter& m_oFileWriter;
     std::wstring m_sFileInDir;
 public:
-    Binary_OtherTableReader(std::wstring sFileInDir, NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter):m_sFileInDir(sFileInDir),Binary_CommonReader(poBufferedStream),m_oFileWriter(oFileWriter)
+    Binary_OtherTableReader(std::wstring sFileInDir, NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter) 
+		: m_sFileInDir(sFileInDir), Binary_CommonReader(poBufferedStream), m_oFileWriter(oFileWriter)
 	{
 	}
 	int Read()
@@ -3039,6 +3059,11 @@ public:
             std::wstring Date(m_oBufferedStream.GetString3(length));
 			pComment->Date = Date;
 		}
+		else if ( c_oSer_CommentsType::OOData == type )
+		{
+			std::wstring Data(m_oBufferedStream.GetString3(length));
+			pComment->OOData = Data;
+		}
 		else if ( c_oSer_CommentsType::Text == type )
 		{
             std::wstring Text(m_oBufferedStream.GetString3(length));
@@ -7017,13 +7042,13 @@ public:
 		{
 			if(false == m_oFileWriter.m_bSaveChartAsImg)
 			{
-				OOX::CPath pathChartsDir = m_oFileWriter.m_oChartWriter.m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR +_T("charts");
+				OOX::CPath pathChartsDir = m_oFileWriter.m_oChartWriter.m_sDir + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"charts";
 				OOX::CSystemUtility::CreateDirectories(pathChartsDir.GetPath());
 				
-				OOX::CPath pathChartsRelsDir = pathChartsDir.GetPath() + FILE_SEPARATOR_STR +  _T("_rels");                
+				OOX::CPath pathChartsRelsDir = pathChartsDir.GetPath() + FILE_SEPARATOR_STR +  L"_rels";                
 				OOX::CSystemUtility::CreateDirectories(pathChartsRelsDir.GetPath());
 
-				OOX::CPath pathChartsWorksheetDir = m_oFileWriter.m_oChartWriter.m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR +_T("embeddings");
+				OOX::CPath pathChartsWorksheetDir = m_oFileWriter.m_oChartWriter.m_sDir + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"embeddings";
 				OOX::CSystemUtility::CreateDirectories(pathChartsWorksheetDir.GetPath());
 
                 int nativeDocumentType = m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_nDocumentType;
@@ -7917,9 +7942,9 @@ public:
 
 		int res = ReadTable(&Binary_NotesTableReader::ReadNotes, this, &oBinary_DocumentTableReader);
 
-		OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir +	FILE_SEPARATOR_STR + _T("word") +
-																			FILE_SEPARATOR_STR + _T("_rels")+
-																			FILE_SEPARATOR_STR + sFilename + _T(".rels");
+		OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir +	FILE_SEPARATOR_STR + L"word" +
+																			FILE_SEPARATOR_STR + L"_rels"+
+																			FILE_SEPARATOR_STR + sFilename + L".rels";
 
 		m_oFileWriter.m_pDrawingConverter->SaveDstContentRels(fileRelsPath.GetPath());
 		return res;
@@ -7956,33 +7981,33 @@ public:
 			XmlUtils::CStringWriter& writer = pBinary_DocumentTableReader->m_oDocumentWriter.m_oContent;
 			if(m_bIsFootnote)
 			{
-				writer.WriteString(_T("<w:footnote"));
+				writer.WriteString(L"<w:footnote");
 			}
 			else
 			{
-				writer.WriteString(_T("<w:endnote"));
+				writer.WriteString(L"<w:endnote");
 			}
 			if(m_oType.IsInit())
 			{
-				writer.WriteString(_T(" w:type=\""));
+				writer.WriteString(L" w:type=\"");
 				writer.WriteString(m_oType->ToString());
-				writer.WriteString(_T("\""));
+				writer.WriteString(L"\"");
 			}
 			if(m_oId.IsInit())
 			{
-				writer.WriteString(_T(" w:id=\""));
+				writer.WriteString(L" w:id=\"");
 				writer.WriteString(m_oId->ToString());
-				writer.WriteString(_T("\""));
+				writer.WriteString(L"\"");
 			}
-			writer.WriteString(_T(">"));
+			writer.WriteString(L">");
 			res = Read1(length, &Binary_NotesTableReader::ReadNoteContent, this, poResult);
 			if(m_bIsFootnote)
 			{
-				writer.WriteString(_T("</w:footnote>"));
+				writer.WriteString(L"</w:footnote>");
 			}
 			else
 			{
-				writer.WriteString(_T("</w:endnote>"));
+				writer.WriteString(L"</w:endnote>");
 			}
 		}
 		else
@@ -8082,8 +8107,8 @@ public:
 			}
 			else
 			{
-				m_oFileWriter.m_oSettingWriter.AddSetting(_T("<w:defaultTabStop w:val=\"708\"/>"));
-                std::wstring sClrMap(_T("<w:clrSchemeMapping w:bg1=\"light1\" w:t1=\"dark1\" w:bg2=\"light2\" w:t2=\"dark2\" w:accent1=\"accent1\" w:accent2=\"accent2\" w:accent3=\"accent3\" w:accent4=\"accent4\" w:accent5=\"accent5\" w:accent6=\"accent6\" w:hyperlink=\"hyperlink\" w:followedHyperlink=\"followedHyperlink\"/>"));
+				m_oFileWriter.m_oSettingWriter.AddSetting(L"<w:defaultTabStop w:val=\"708\"/>");
+                std::wstring sClrMap(L"<w:clrSchemeMapping w:bg1=\"light1\" w:t1=\"dark1\" w:bg2=\"light2\" w:t2=\"dark2\" w:accent1=\"accent1\" w:accent2=\"accent2\" w:accent3=\"accent3\" w:accent4=\"accent4\" w:accent5=\"accent5\" w:accent6=\"accent6\" w:hyperlink=\"hyperlink\" w:followedHyperlink=\"followedHyperlink\"/>");
 				m_oFileWriter.m_oSettingWriter.AddSetting(sClrMap);
 				m_oFileWriter.m_pDrawingConverter->LoadClrMap(sClrMap);
 			}
@@ -8135,9 +8160,12 @@ public:
 					case c_oSerTableTypes::Endnotes:
 						res = Binary_NotesTableReader(m_oBufferedStream, m_oFileWriter, m_oFileWriter.m_pComments, false).Read();
 						break;
+					case c_oSerTableTypes::VbaProject:
+						res = Binary_VbaProjectTableReader(m_oBufferedStream, m_oFileWriter).Read();
+						break;
 
 					//Comments должны читаться раньше чем c_oSerTableTypes::Document
-					//case c_oSerTableTypes::Comments:
+					//case c_oSerTableTypes::Comments
 					//	res = oBinary_CommentsTableReader.Read();
 					//	break;
 					//case c_oSerTableTypes::Other:
@@ -8160,7 +8188,18 @@ public:
                 m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable",	L"fontTable.xml",	L"", &stamdartRId);
                 m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme",		L"theme/theme1.xml",L"", &stamdartRId);
                
-				m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",	L"/word",		L"document.xml");
+				if (m_oFileWriter.m_pVbaProject.IsInit())
+				{
+					//m_oFileWriter.m_pVbaProject->write();
+					m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.microsoft.com/office/2006/relationships/vbaProject",		L"vbaProject.bin", L"", &stamdartRId);
+					
+					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.ms-word.document.macroEnabled.main+xml",	L"/word",		L"document.xml");
+					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.ms-office.vbaProject",					L"/word",		L"vbaProject.bin");
+				}
+				else
+				{
+					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",	L"/word",		L"document.xml");
+				}
 				m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml",			L"/word",		L"styles.xml");
 				m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml",			L"/word",		L"settings.xml");
 				m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml",		L"/word",		L"webSettings.xml");
@@ -8170,19 +8209,19 @@ public:
 				if(false == m_oFileWriter.m_oNumberingWriter.IsEmpty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering")), std::wstring(_T("numbering.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering", L"numbering.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml", L"/word", L"numbering.xml");
 				}
                 if(false == m_oFileWriter.m_oFootnotesWriter.IsEmpty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes")), std::wstring(_T("footnotes.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes", L"footnotes.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml", L"/word", L"footnotes.xml");
 				}
                 if(false == m_oFileWriter.m_oEndnotesWriter.IsEmpty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes")), std::wstring(_T("endnotes.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes", L"endnotes.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml", L"/word", L"endnotes.xml");
 				}
 				for(size_t i = 0; i < m_oFileWriter.m_oHeaderFooterWriter.m_aHeaders.size(); ++i)
@@ -8191,7 +8230,7 @@ public:
 					if(false == pHeader->IsEmpty())
 					{
 						long rId;
-                        m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/header")), pHeader->m_sFilename, std::wstring(), &rId);
+                        m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/header", pHeader->m_sFilename, std::wstring(), &rId);
                         pHeader->rId = L"rId" + std::to_wstring( rId );
 						
 						m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml", L"/word", pHeader->m_sFilename);
@@ -8203,7 +8242,7 @@ public:
 					if(false == pFooter->IsEmpty())
 					{
 						long rId;
-                        m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer")), pFooter->m_sFilename, std::wstring(), &rId);
+                        m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer", pFooter->m_sFilename, std::wstring(), &rId);
                         pFooter->rId = L"rId" + std::to_wstring( rId );
 						
 						m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml", L"/word", pFooter->m_sFilename);
@@ -8211,9 +8250,9 @@ public:
 				}
 				res = Binary_DocumentTableReader(m_oBufferedStream, m_oFileWriter, m_oFileWriter.m_oDocumentWriter, &oBinary_CommentsTableReader.m_oComments).Read();
 
-                OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir	+ FILE_SEPARATOR_STR + _T("word")
-																					+ FILE_SEPARATOR_STR + _T("_rels")
-																					+ FILE_SEPARATOR_STR + _T("document.xml.rels");
+                OOX::CPath fileRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir	+ FILE_SEPARATOR_STR + L"word"
+																					+ FILE_SEPARATOR_STR + L"_rels"
+																					+ FILE_SEPARATOR_STR + L"document.xml.rels";
 
                 CComments& oComments= oBinary_CommentsTableReader.m_oComments;
 				Writers::CommentsWriter& oCommentsWriter = m_oFileWriter.m_oCommentsWriter;
@@ -8227,19 +8266,19 @@ public:
 				if(false == oCommentsWriter.m_sComment.empty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments")), std::wstring(_T("comments.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments", L"comments.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml", L"/word", L"comments.xml");
 				}
                 if(false == oCommentsWriter.m_sCommentExt.empty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.microsoft.com/office/2011/relationships/commentsExtended")), std::wstring(_T("commentsExtended.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.microsoft.com/office/2011/relationships/commentsExtended", L"commentsExtended.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml", L"/word", L"commentsExtended.xml");
 				}
                 if(false == oCommentsWriter.m_sPeople.empty())
 				{
 					long rId;
-                    m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.microsoft.com/office/2011/relationships/people")), std::wstring(_T("people.xml")), std::wstring(), &rId);
+                    m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.microsoft.com/office/2011/relationships/people", L"people.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.people+xml", L"/word", L"people.xml");
 				}
 

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -125,6 +125,7 @@ const double g_dKoef_mm_to_hps = 2 * g_dKoef_mm_to_pt;
 
 const static wchar_t* g_sFormatSignature = L"DOCY";
 const int g_nFormatVersion = 5;
+const int g_nFormatVersionNoBase64 = 10;
 extern int g_nCurFormatVersion;
 	namespace c_oAscWrapStyle{enum c_oSerFormat
 	{
@@ -141,19 +142,20 @@ extern int g_nCurFormatVersion;
 	};}
 	namespace c_oSerTableTypes{enum c_oSerTableTypes
 	{
-		Signature = 0,
-		Info = 1,
-		Media = 2,
-		Numbering = 3,
-		HdrFtr = 4,
-		Style = 5,
-		Document = 6,
-		Other = 7,
-		Comments = 8,
-		Settings = 9,
-		Footnotes = 10,
-		Endnotes = 11,
-		Background
+		Signature	= 0,
+		Info		= 1,
+		Media		= 2,
+		Numbering	= 3,
+		HdrFtr		= 4,
+		Style		= 5,
+		Document	= 6,
+		Other		= 7,
+		Comments	= 8,
+		Settings	= 9,
+		Footnotes	= 10,
+		Endnotes	= 11,
+		Background	= 12,
+		VbaProject	= 13
 	};}
 	namespace c_oSerSigTypes{enum c_oSerSigTypes
 	{
@@ -202,10 +204,10 @@ extern int g_nCurFormatVersion;
 	};}
 	namespace c_oSerOtherTableTypes{enum c_oSerOtherTableTypes
 	{
-		ImageMap = 0,
-		ImageMap_Src = 1,
-		EmbeddedFonts = 2,
-		DocxTheme = 3
+		ImageMap		= 0,
+		ImageMap_Src	= 1,
+		EmbeddedFonts	= 2,
+		DocxTheme		= 3
 	};}
 	namespace c_oSerFontsTypes{enum c_oSerFontsTypes
 	{
@@ -342,7 +344,8 @@ extern int g_nCurFormatVersion;
 		FramePr = 30,
 		SectPr = 31,
 		numPr_Ins =  32,
-		pPrChange = 33
+		pPrChange = 33,
+		outlineLvl = 34
 	};}
 	namespace c_oSerProp_rPrType{enum c_oSerProp_rPrType
 	{
@@ -520,6 +523,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,
@@ -715,7 +722,8 @@ extern int g_nCurFormatVersion;
 		Text = 6,
 		QuoteText = 7,
 		Solved = 8,
-		Replies = 9
+		Replies = 9,
+		OOData = 10
 	};}
 	namespace c_oSer_SettingsType{enum c_oSer_SettingsType
 	{

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -82,11 +82,11 @@ namespace BinDocxRW
 		int m_nType;
 	public:
         std::wstring m_sFld;
-    public: FldStruct(std::wstring sFld, int nType):m_sFld(sFld),m_nType(nType){}
-	public: int GetType()
-			{
-				return m_nType;
-			}
+		FldStruct(std::wstring sFld, int nType):m_sFld(sFld),m_nType(nType){}
+		int GetType()
+		{
+			return m_nType;
+		}
 	};
 	class BinaryCommonWriter
 	{
@@ -1024,6 +1024,12 @@ namespace BinDocxRW
 					WritePPrChange(pPr.m_oPPrChange.get());
 					m_oBcw.WriteItemWithLengthEnd(nCurPos);
 				}
+				if(pPr.m_oOutlineLvl.IsInit() && pPr.m_oOutlineLvl->m_oVal.IsInit())
+				{
+					m_oBcw.m_oStream.WriteBYTE(c_oSerProp_pPrType::outlineLvl);
+					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Long);
+					m_oBcw.m_oStream.WriteLONG(pPr.m_oOutlineLvl->m_oVal->GetValue());
+				}
 				//SectPr
 				if(NULL != m_oBinaryHeaderFooterTableWriter && pPr.m_oSectPr.IsInit())
 				{
@@ -3025,7 +3031,14 @@ namespace BinDocxRW
                 std::wstring& sShapeType = aShapeTypes[i];
 				pOfficeDrawingConverter->AddShapeType(sShapeType);
 			}
-			pOfficeDrawingConverter->SetRels(oldRels);
+            pOfficeDrawingConverter->SetRels(oldRels);
+		}
+		void WriteVbaProject(OOX::VbaProject& oVbaProject)
+		{
+            m_oBcw.m_oStream.StartRecord(0);
+            oVbaProject.toPPTY(&m_oBcw.m_oStream);
+            m_oBcw.m_oStream.EndRecord();
+
 		}
 		void Write(std::vector<OOX::WritingElement*>& aElems)
 		{
@@ -7222,6 +7235,11 @@ namespace BinDocxRW
 					m_oBcw.m_oStream.WriteBYTE(c_oSer_CommentsType::Date);
 					m_oBcw.m_oStream.WriteStringW(pComment->m_oDate->ToString());
 				}
+				if(pComment->m_oOOData.IsInit())
+				{
+					m_oBcw.m_oStream.WriteBYTE(c_oSer_CommentsType::OOData);
+					m_oBcw.m_oStream.WriteStringW(pComment->m_oOOData.get2());
+				}
 				if(pComment->m_oId.IsInit())
 				{
 					nCurPos = m_oBcw.WriteItemStart(c_oSer_CommentsType::Id);
@@ -7714,9 +7732,9 @@ namespace BinDocxRW
 			m_nLastFilePos = 0;
 			m_nRealTableCount = 0;
 		}
-        static std::wstring WriteFileHeader(long nDataSize)
+        static std::wstring WriteFileHeader(long nDataSize, int version)
 		{
-            std::wstring sHeader = std::wstring(g_sFormatSignature) + L";v" + std::to_wstring(g_nFormatVersion) + L";" + std::to_wstring(nDataSize) + L";";
+            std::wstring sHeader = std::wstring(g_sFormatSignature) + L";v" + std::to_wstring(version) + L";" + std::to_wstring(nDataSize) + L";";
 			return sHeader;
 		}
 		void WriteMainTableStart()
@@ -7861,9 +7879,8 @@ namespace BinDocxRW
 		//Write DocumentTable
 				ParamsDocumentWriter oParamsDocumentWriter(poDocument);
 				m_oParamsWriter.m_pCurRels = oParamsDocumentWriter.m_pRels;
-				
+		
 		//DocumentTable всегда пишем последней, чтобы сначала заполнить все вспомогательные структуры, а при заполении документа, вызывать методы типа Style_Add...
-				nCurPos = this->WriteTableStart(BinDocxRW::c_oSerTableTypes::Document);
 				BinDocxRW::BinaryDocumentTableWriter oBinaryDocumentTableWriter(m_oParamsWriter, oParamsDocumentWriter, &m_oParamsWriter.m_mapIgnoreComments, &oBinaryHeaderFooterTableWriter);
 				oBinaryDocumentTableWriter.prepareOfficeDrawingConverter(m_oParamsWriter.m_pOfficeDrawingConverter, oParamsDocumentWriter.m_pRels, poDocument->m_arrShapeTypes);
 				
@@ -7871,7 +7888,15 @@ namespace BinDocxRW
 				oBinaryDocumentTableWriter.pBackground		= poDocument->m_oBackground.GetPointer();
 
 				oBinaryDocumentTableWriter.m_bWriteSectPr	= true;
+		//Write Vba
+				if(NULL != oDocx.m_pVbaProject)
+				{
+					nCurPos = this->WriteTableStart(BinDocxRW::c_oSerTableTypes::VbaProject);
+					oBinaryDocumentTableWriter.WriteVbaProject(*oDocx.m_pVbaProject);
+					this->WriteTableEnd(nCurPos);
+				}
 		// Write content
+				nCurPos = this->WriteTableStart(BinDocxRW::c_oSerTableTypes::Document);
 				oBinaryDocumentTableWriter.Write(poDocument->m_arrItems);
 				this->WriteTableEnd(nCurPos);
 

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -47,6 +47,7 @@ BinDocxRW::CDocxSerializer::CDocxSerializer()
 	m_pCurFileWriter	= NULL;
 
 	m_bIsNoBase64Save	= false;
+	m_bIsNoBase64	= false;
 	m_bSaveChartAsImg	= false;
 }
 BinDocxRW::CDocxSerializer::~CDocxSerializer()
@@ -54,52 +55,6 @@ BinDocxRW::CDocxSerializer::~CDocxSerializer()
 	RELEASEOBJECT(m_pParamsWriter);
 	RELEASEOBJECT(m_pCurFileWriter);
 }
-bool BinDocxRW::CDocxSerializer::ConvertDocxToDoct(const std::wstring& sSrcFileName, const std::wstring& sDstFileName, const std::wstring& sTmpDir, const std::wstring& sXMLOptions)
-{
-    std::wstring strDirSrc      = NSSystemPath::Combine(sTmpDir,	L"from");
-    std::wstring strDirDst      = NSSystemPath::Combine(sTmpDir,	L"to");
-    std::wstring strEditorBin   = NSSystemPath::Combine(strDirDst,	L"Editor.bin");
-
-    NSDirectory::CreateDirectory(strDirSrc);
-	NSDirectory::CreateDirectory(strDirDst);
-
-    COfficeUtils oCOfficeUtils(NULL);
-
-    if(S_OK == oCOfficeUtils.ExtractToDirectory(sSrcFileName, strDirSrc, NULL, 0))
-		if(saveToFile(strEditorBin, strDirSrc, sXMLOptions))
-            if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, sDstFileName))
-				return true;
-	return false;
-}
-bool BinDocxRW::CDocxSerializer::ConvertDoctToDocx(const std::wstring& sSrcFileName, const std::wstring& sDstFileName, const std::wstring& sTmpDir, const std::wstring& sXMLOptions)
-{
-	std::wstring strDirSrc		= NSSystemPath::Combine(sTmpDir,	L"from");
-	std::wstring strEditorBin	= NSSystemPath::Combine(strDirSrc,	L"Editor.bin");
-	std::wstring strDirDst		= NSSystemPath::Combine(sTmpDir,	L"to");
-	
-	NSDirectory::CreateDirectory(strDirSrc);
-	NSDirectory::CreateDirectory(strDirDst);
-	
-    std::wstring sEditorBin = strEditorBin;
-
-    COfficeUtils oCOfficeUtils(NULL);
-
-    if(S_OK == oCOfficeUtils.ExtractToDirectory(sSrcFileName, strDirSrc, NULL, 0))
-    {
-        std::wstring sMediaPath;
-        std::wstring sThemePath;
-        std::wstring sEmbedPath;
-
-        CreateDocxFolders(strDirDst, sThemePath, sMediaPath, sEmbedPath);
-
-        if(loadFromFile(sEditorBin, strDirDst, sXMLOptions, sThemePath, sMediaPath, sEmbedPath))
-        {
-            if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, sDstFileName, true))
-				return true;
-        }
-    }
-    return false;
-}
 bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions)
 {
 	OOX::CPath pathMain(sSrcFileName);
@@ -138,19 +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);
@@ -166,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();
 		}
@@ -268,28 +229,45 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				else
                     dst_len += _c;
 			}
-			
-            int nDataSize = atoi(dst_len.c_str());
-			BYTE* pData = new BYTE[nDataSize];
-			
-            if(false != Base64::Base64Decode((const char*)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize))
+			int nVersion = g_nFormatVersion;
+			if(!version.empty())
 			{
-                NSBinPptxRW::CDrawingConverter oDrawingConverter;
-				
-				NSBinPptxRW::CBinaryFileReader& oBufferedStream = *oDrawingConverter.m_pReader;
-				oBufferedStream.Init(pData, 0, nDataSize);
+				version = version.substr(1);
+				g_nCurFormatVersion = nVersion = std::stoi(version.c_str());
+			}
+			bool bIsNoBase64 = nVersion == g_nFormatVersionNoBase64;
 
-				int nVersion = g_nFormatVersion;
-                if(!version.empty())
+			NSBinPptxRW::CDrawingConverter oDrawingConverter;
+			NSBinPptxRW::CBinaryFileReader& oBufferedStream = *oDrawingConverter.m_pReader;
+			int nDataSize = 0;
+			BYTE* pData = NULL;
+			if (!bIsNoBase64)
+			{
+				nDataSize = atoi(dst_len.c_str());
+				pData = new BYTE[nDataSize];
+				if(Base64::Base64Decode((const char*)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize))
 				{
-                    version = version.substr(1);
-                    int nTempVersion = atoi(version.c_str());
-					if(0 != nTempVersion)
-					{
-						g_nCurFormatVersion = nVersion = nTempVersion;
-					}
-				}		
+					oBufferedStream.Init(pData, 0, nDataSize);
+				}
+				else
+				{
+					RELEASEARRAYOBJECTS(pData);
+				}
+			}
+			else
+			{
+				nDataSize = nBase64DataSize;
+				pData = pBase64Data;
+				oBufferedStream.Init(pData, 0, nDataSize);
+				oBufferedStream.Seek(nIndex);
+			}
+
+			
+			if (NULL != pData)
+			{
 				oDrawingConverter.SetMainDocument(this);
+                oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"word");
+
 				oDrawingConverter.SetMediaDstPath(sMediaPath);
 				oDrawingConverter.SetEmbedDstPath(sEmbedPath);
 				
@@ -299,7 +277,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
                 std::wstring sFileInDir = strFileInDir.c_str();
 
-                oDrawingConverter.SetSourceFileDir(sFileInDir);
+                oDrawingConverter.SetSrcPath(sFileInDir);
 				
 				BinaryFileReader oBinaryFileReader(sFileInDir, oBufferedStream, *m_pCurFileWriter);
 				oBinaryFileReader.ReadFile();
@@ -318,7 +296,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				if (pApp)
 				{
 					pApp->SetApplication(_T("OnlyOffice"));
-					pApp->SetAppVersion(_T("4.3000"));
+					pApp->SetAppVersion(_T("5.0"));
 					pApp->SetDocSecurity(0);
 					pApp->SetScaleCrop(false);
 					pApp->SetLinksUpToDate(false);
@@ -343,6 +321,11 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				bResultOk = true;
 
 			}
+			if (!bIsNoBase64)
+			{
+				RELEASEARRAYOBJECTS(pData);
+			}
+
 		}
 		RELEASEARRAYOBJECTS(pBase64Data);
 	}
@@ -472,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

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

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -49,6 +49,7 @@ namespace BinXlsxRW{
 	CXlsxSerializer::CXlsxSerializer()
 	{
 		m_pExternalDrawingConverter = NULL;
+		m_bIsNoBase64 = false;
 	}
 	CXlsxSerializer::~CXlsxSerializer()
 	{
@@ -85,15 +86,16 @@ namespace BinXlsxRW{
 	}
     bool CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir)
 	{
+        std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
+
 		NSBinPptxRW::CDrawingConverter oDrawingConverter;
 		
+        oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"xl");
+        oDrawingConverter.SetSrcPath(strFileInDir, 2);
+
 		oDrawingConverter.SetMediaDstPath(sMediaDir);
 		oDrawingConverter.SetEmbedDstPath(sEmbedDir);
 
-		std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
-
-        oDrawingConverter.SetSourceFileDir(strFileInDir, 2);
-
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;
 		oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions);
 		return true;
@@ -134,7 +136,7 @@ namespace BinXlsxRW{
 		oOfficeDrawingConverter.SetFontPicker(pFontPicker);
 
 		BinXlsxRW::BinaryFileWriter oBinaryFileWriter(fp);
-		oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions);
+		oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions, m_bIsNoBase64);
 
 		RELEASEOBJECT(pFontPicker);
 		return true;
@@ -226,6 +228,11 @@ namespace BinXlsxRW{
 	{
 		m_pExternalDrawingConverter = pDrawingConverter;
 	}
+	void CXlsxSerializer::setIsNoBase64(bool bIsNoBase64)
+	{
+		m_bIsNoBase64 = bIsNoBase64;
+	}
+
 	void CXlsxSerializer::writeChartXlsx(const std::wstring& sDstFile, const OOX::Spreadsheet::CChartSpace& oChart)
 	{
 	//анализируем chart

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h

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

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj

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

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.cpp

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

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcproj

@@ -43,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"
@@ -335,6 +336,14 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\Common\OfficeFileFormatChecker.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Common\OfficeFileFormatChecker2.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\Common\3dParty\pole\pole.cpp"
 				>

ASCOfficeOdfFile/formulasconvert/formulasconvert.h

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

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

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

ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp

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

ASCOfficeOdfFile/include/cpdoccore/odf/odf_document.h

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

ASCOfficeOdfFile/include/cpdoccore/xml/attributes.h

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

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -105,6 +105,7 @@ SOURCES += \
     ../src/odf/table_calculation_settings.cpp \
     ../src/odf/table_docx.cpp \
     ../src/odf/table_named_expressions.cpp \
+    ../src/odf/table_data_pilot_tables.cpp \
     ../src/odf/table_pptx.cpp \
     ../src/odf/table_xlsx.cpp \
     ../src/odf/templates.cpp \
@@ -209,6 +210,14 @@ SOURCES += \
     ../src/odf/datatypes/wrapoption.cpp \
     ../src/odf/datatypes/writingmode.cpp \
     ../src/odf/datatypes/xlink.cpp \
+    ../src/odf/datatypes/chartlabelposition.cpp \
+    ../src/odf/datatypes/grandtotal.cpp \
+    ../src/odf/datatypes/membertype.cpp \
+    ../src/odf/datatypes/tabletype.cpp \
+    ../src/odf/datatypes/tableorientation.cpp \
+    ../src/odf/datatypes/tablefunction.cpp \
+    ../src/odf/datatypes/tableorder.cpp \
+    ../src/odf/datatypes/dategroup.cpp \
     ../src/docx/xlsx_conditionalFormatting.cpp \
     ../src/docx/xlsx_dxfs.cpp \
     ../src/docx/docx_content_type.cpp \
@@ -278,6 +287,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

@@ -96,7 +96,7 @@ void text_tracked_context::start_change (std::wstring id)
 {
 	current_state_.clear();
 
-	current_state_.id	= id;
+	current_state_.id = id;
 }
 void text_tracked_context::end_change ()
 {
@@ -378,7 +378,8 @@ void docx_conversion_context::start_document()
 	output_stream() << L"xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" "; 
 	output_stream() << L"xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" "; 
 	output_stream() << L"xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" "; 
-	output_stream() << L"xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" "; 
+	output_stream() << L"xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" ";
+	output_stream() << L"xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" ";
 	output_stream() << L"mc:Ignorable=\"w14 wp14\">";
 
 
@@ -406,14 +407,12 @@ void docx_conversion_context::end_document()
    
 	output_document_->get_word_files().set_notes(notes_context_);
 ////////////////////////	
-	int count = 0;
-    BOOST_FOREACH(const oox_chart_context_ptr& chart, charts_)
+	for (size_t i = 0; i < charts_.size(); i++)
     {
-		count++;
 		package::chart_content_ptr content = package::chart_content::create();
 
-		chart->serialize(content->content());
-		chart->dump_rels(content->get_rel_file()->get_rels());
+		charts_[i]->serialize(content->content());
+		charts_[i]->dump_rels(content->get_rel_file()->get_rels());
 
 		output_document_->get_word_files().add_charts(content);
 	
@@ -580,10 +579,10 @@ mc:Ignorable=\"w14 wp14\">";
         strm << L"</w:abstractNum>";
     }
 
-    BOOST_FOREACH(int numId, numIds)
+	for (size_t i = 0; i < numIds.size(); i++)
     {
-        strm << L"<w:num w:numId=\"" << numId << L"\" >";
-        strm << L"<w:abstractNumId w:val=\"" << numId << "\" />";
+        strm << L"<w:num w:numId=\"" << numIds[i] << L"\" >";
+        strm << L"<w:abstractNumId w:val=\"" << numIds[i] << "\" />";
         strm << L"</w:num>";    
     }
 
@@ -801,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
 		{
@@ -1286,7 +1285,8 @@ void docx_conversion_context::start_text_changes (std::wstring id)
 										L" w:author=\""	+ state.author	+ L"\"" ;
 
 		finish_run();
-		state.active = true;
+		state.active		= true;
+		state.in_drawing	= get_drawing_state_content();
 		
 		if (state.type	== 1)
 		{
@@ -1420,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

@@ -492,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()
 		{
@@ -505,6 +506,7 @@ public:
 			date.clear();
 			content.clear();
 			active = false;
+			in_drawing = false;
 		}
 	};
 	std::wstring dumpPPr_;

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

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

ASCOfficeOdfFile/src/docx/docx_package.cpp

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

ASCOfficeOdfFile/src/docx/docx_package.h

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

ASCOfficeOdfFile/src/docx/docx_table_context.cpp

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

ASCOfficeOdfFile/src/docx/hyperlinks.cpp

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

ASCOfficeOdfFile/src/docx/mediaitems.cpp

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

ASCOfficeOdfFile/src/docx/mediaitems.h

@@ -127,6 +127,7 @@ public:
 		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;
 	}

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

ASCOfficeOdfFile/src/docx/oox_chart_series.h

@@ -55,6 +55,7 @@ public:
 	
 	virtual void oox_serialize(std::wostream & _Wostream) = 0;
 	
+	bool						labelPosEnabled_;
 	_oox_chart_values			values_[5]; //cat(labels), common, x, y, bubble, 
 	int							id_;
 	std::wstring				name_;	//tx (Series Text) §21.2.2.215

ASCOfficeOdfFile/src/docx/oox_chart_shape.cpp

@@ -29,7 +29,6 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp

@@ -32,7 +32,6 @@
 
 #include "oox_conversion_context.h"
 
-#include <boost/foreach.hpp>
 #include <iostream>
 #include <cpdoccore/xml/utils.h>
 #include <cpdoccore/odf/odf_document.h>
@@ -145,7 +144,7 @@ void styles_context::docx_serialize_table_style(std::wostream & strm, std::wstri
 namespace oox
 {
 math_context::math_context(odf_reader::fonts_container & fonts, bool graphic) :
-base_font_size_(12), fonts_container_(fonts)
+						base_font_size_(12), fonts_container_(fonts), is_need_e_(false)
 {
 	graphRPR_ = graphic;
 

ASCOfficeOdfFile/src/docx/oox_conversion_context.h

@@ -106,6 +106,8 @@ namespace oox {
 
 		std::wstring							nsRPr_;
 		bool									graphRPR_;
+
+		bool									is_need_e_;
 	private:
 		std::wstringstream						math_stream_;
 		std::wstringstream						math_style_stream_;

ASCOfficeOdfFile/src/docx/oox_data_labels.cpp

@@ -37,8 +37,6 @@
 #include "oox_data_labels.h"
 #include "oox_chart_shape.h"
 
-#include <boost/foreach.hpp>
-
 namespace cpdoccore {
 namespace oox {
 
@@ -51,6 +49,8 @@ oox_data_labels::oox_data_labels()//подписи на значениях
 	showPercent_		= false;
 	showSerName_		= false;
 	showVal_			= false;
+
+	position_			= -1; //not set
 }
 
 void oox_data_labels::set_common_dLbl ( std::vector<odf_reader::_property> & text_properties)
@@ -107,6 +107,29 @@ void oox_data_labels::oox_serialize(std::wostream & _Wostream)
 					}
 				}
 			}
+			if (position_ >= 0 && position_ < 13)
+			{
+				CP_XML_NODE(L"c:dLblPos")
+				{
+					switch (position_)
+					{
+					case 0: CP_XML_ATTR(L"val", L"bestFit");break;
+					case 1: CP_XML_ATTR(L"val", L"b");		break;
+					case 2: CP_XML_ATTR(L"val", L"b");		break;
+					case 3: CP_XML_ATTR(L"val", L"b");		break;
+					case 6: CP_XML_ATTR(L"val", L"l");		break;
+					case 7: CP_XML_ATTR(L"val", L"inBase");	break;
+					case 9: CP_XML_ATTR(L"val", L"r");		break;
+					case 10: CP_XML_ATTR(L"val", L"t");		break;
+					case 11: CP_XML_ATTR(L"val", L"t");		break;
+					case 12: CP_XML_ATTR(L"val", L"t");		break;
+					case 5: //CP_XML_ATTR(L"val", L"inEnd");	break;
+					case 8: //CP_XML_ATTR(L"val", L"outEnd");	break;
+					case 4: CP_XML_ATTR(L"val", L"ctr");	break;
+
+					}
+				}
+			}
 
 			CP_XML_NODE(L"c:showLegendKey")
 			{

ASCOfficeOdfFile/src/docx/oox_data_labels.h

@@ -59,8 +59,10 @@ public:
 	void set_showSerName	(bool Val){showSerName_		= Val;}
 	void set_showVal		(bool Val){showVal_			= Val;}
 
-	void add_dLbl(int ind, std::vector<odf_reader::_property> & text_properties);
-	void set_common_dLbl ( std::vector<odf_reader::_property> & text_properties);
+	void set_position		(int Val){position_	= Val;}
+
+	void add_dLbl			(int ind, std::vector<odf_reader::_property> & text_properties);
+	void set_common_dLbl	( std::vector<odf_reader::_property> & text_properties);
    
 private:
 
@@ -72,6 +74,8 @@ private:
 	bool showSerName_;			// (Show Series Name) §21.2.2.188
 	bool showVal_;				// (Show Value) §21.2.2.189
 
+	int position_;
+
 	std::vector<odf_reader::_property>					textPr_;
 	std::map<int, std::vector<odf_reader::_property>>	dLbls_;
 

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

@@ -171,7 +171,7 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
 					if ( color.empty() )
 					{
 						if (always_draw)	color = L"000000";
-						else				color = L"ffffff";
+						else				color = L"FFFFFF";
 					}
 					
 					CP_XML_NODE(L"a:srgbClr")
@@ -210,16 +210,15 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
 		}
     }
 }
-void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_property> & prop)
+void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_property> & prop, const std::wstring & shapeGeomPreset)
 {
 	CP_XML_WRITER(strm)
     {
 		CP_XML_NODE(L"a:avLst")
 		{
-			_CP_OPT(bool) bModifiers;
 			_CP_OPT(std::wstring) strModifiers;
-			odf_reader::GetProperty(prop, L"bModifiers",		bModifiers);
 			odf_reader::GetProperty(prop, L"oox-draw-modifiers", strModifiers);
+			
 			if (strModifiers)
 			{
 				std::vector< std::wstring > values;
@@ -227,17 +226,61 @@ void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_pro
 
 				if (!values.empty() && values.back().empty()) values.pop_back();
 
+				std::vector<std::wstring> names;
+			
+				if (std::wstring::npos != shapeGeomPreset.find(L"math") ||
+					std::wstring::npos != shapeGeomPreset.find(L"bentConnector") || 
+					std::wstring::npos != shapeGeomPreset.find(L"curvedConnector")|| 
+					std::wstring::npos != shapeGeomPreset.find(L"frame"))
+				{
+					names.push_back(L"adj1");
+				}
+				else if (std::wstring::npos != shapeGeomPreset.find(L"decagon"))
+				{
+					names.push_back(L"vf");
+				}
+				else if (std::wstring::npos != shapeGeomPreset.find(L"heptagon") ||
+						 std::wstring::npos != shapeGeomPreset.find(L"pentagon"))
+				{
+					names.push_back(L"hf");
+					names.push_back(L"vf");
+				}
+				else if (std::wstring::npos != shapeGeomPreset.find(L"hexagon"))
+				{
+					names.push_back(L"adj");
+					names.push_back(L"vf");
+				}
+				else if (std::wstring::npos != shapeGeomPreset.find(L"star5")|| 
+						 std::wstring::npos != shapeGeomPreset.find(L"star7"))
+				{
+					names.push_back(L"adj");
+					names.push_back(L"hf");
+					names.push_back(L"vf");
+				}
+				else if (std::wstring::npos != shapeGeomPreset.find(L"star6") ||
+						 std::wstring::npos != shapeGeomPreset.find(L"star10"))
+				{
+					names.push_back(L"adj");
+					names.push_back(L"hf");
+				}
+
 				for (size_t i = 0; i < values.size(); i++)
 				{
 					if (values[i].empty()) continue;
+					
 					CP_XML_NODE(L"a:gd")
 					{
-						if (values.size() > 1 || bModifiers)
-							//весьма странное .. для некоторых модификаторов (напр math...) нужно указывать множественность их
-							CP_XML_ATTR(L"name", L"adj" + std::to_wstring(i+1));
+						if (names.size() > i)
+						{
+							CP_XML_ATTR(L"name", names[i]);
+						}
 						else
-							CP_XML_ATTR(L"name", L"adj");
-						
+						{
+							if (values.size() > 1)
+								CP_XML_ATTR(L"name", L"adj" + std::to_wstring(i + 1));
+							else
+								CP_XML_ATTR(L"name", L"adj");
+						}						
 						CP_XML_ATTR(L"fmla", L"val " + values[i]);
 					}
 				}
@@ -263,8 +306,8 @@ void _oox_drawing::serialize_bodyPr(std::wostream & strm, const std::wstring & n
 			odf_reader::GetProperty(prop,L"text-padding-bottom"	, dPaddingBottom);
 			
 			if (dPaddingLeft)	CP_XML_ATTR(L"lIns", (int)(*dPaddingLeft));
-			if (dPaddingRight)	CP_XML_ATTR(L"rIns", (int)(*dPaddingRight));
 			if (dPaddingTop)	CP_XML_ATTR(L"tIns", (int)(*dPaddingTop));
+			if (dPaddingRight)	CP_XML_ATTR(L"rIns", (int)(*dPaddingRight));
 			if (dPaddingBottom)	CP_XML_ATTR(L"bIns", (int)(*dPaddingBottom));
 
 			if (inGroup == false)
@@ -321,7 +364,8 @@ void _oox_drawing::serialize_bodyPr(std::wostream & strm, const std::wstring & n
 					CP_XML_NODE(L"a:prstTxWarp")
 					{
 						CP_XML_ATTR(L"prst", shapeType);
-						oox_serialize_aLst(CP_XML_STREAM(), prop);
+						
+						oox_serialize_aLst(CP_XML_STREAM(), prop, shapeType);
 					}
 				}
 			}
@@ -370,7 +414,8 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
 		{
 			CP_XML_NODE(L"a:custGeom")
 			{        
-				oox_serialize_aLst(CP_XML_STREAM(), additional);
+				std::vector<std::wstring> names;
+				oox_serialize_aLst(CP_XML_STREAM(), additional, L"");
 				
 				CP_XML_NODE(L"a:ahLst");
 				CP_XML_NODE(L"a:gdLst");
@@ -391,8 +436,14 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
 				{ 	
 					CP_XML_NODE(L"a:path")
 					{
-						CP_XML_ATTR(L"w", w ? *w : cx);
-						CP_XML_ATTR(L"h", h ? *h : cy);
+						int path_w = w ? *w : cx;
+						int path_h = h ? *h : cy;
+
+						if (path_w < 1) path_w = 1024;  
+						if (path_h < 1) path_h = 1024; 
+
+						CP_XML_ATTR(L"w", path_w);
+						CP_XML_ATTR(L"h", path_h);
 						
 						if (sCustomPath)
 						{	
@@ -414,11 +465,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
 				CP_XML_ATTR(L"prst", shapeGeomPreset);
 				if (!bWordArt) 
 				{
-					if (std::wstring::npos != shapeGeomPreset.find(L"mathPlus"))
-					{
-						additional.push_back(odf_reader::_property(L"bModifiers", true));
-					}
-					oox_serialize_aLst(CP_XML_STREAM(), additional);
+					oox_serialize_aLst(CP_XML_STREAM(), additional, shapeGeomPreset);
 				}
 			}					
 		}
@@ -508,10 +555,13 @@ void _oox_drawing::serialize_xfrm(std::wostream & strm, const std::wstring & nam
 					CP_XML_ATTR(L"x", 0);
 					CP_XML_ATTR(L"y", 0);
 				}
-				CP_XML_NODE(L"a:chExt")
+				if (cx > 0 || cy > 0)
 				{
-					CP_XML_ATTR(L"cx", cx);
-					CP_XML_ATTR(L"cy", cy);
+					CP_XML_NODE(L"a:chExt")
+					{
+						CP_XML_ATTR(L"cx", cx);
+						CP_XML_ATTR(L"cy", cy);
+					}
 				}
 			}
 		}
@@ -525,9 +575,6 @@ void oox_serialize_action(std::wostream & strm, _action_desc const & val)
     {
 		CP_XML_NODE(L"a:hlinkClick")
 		{
-			//CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-			//CP_XML_ATTR(L"xmlns:a", L"http://schemas.openxmlformats.org/drawingml/2006/main");
-
 			if (!val.action.empty())
 				CP_XML_ATTR(L"action", val.action);
 			
@@ -544,6 +591,8 @@ void oox_serialize_action(std::wostream & strm, _action_desc const & val)
 					CP_XML_ATTR(L"name", L"sound");
 				}
 			}
+			//CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+			//CP_XML_ATTR(L"xmlns:a", L"http://schemas.openxmlformats.org/drawingml/2006/main");
 		}
 	}
 }

ASCOfficeOdfFile/src/docx/oox_drawing.h

@@ -83,7 +83,7 @@ namespace oox {
 	class _oox_drawing
     {
 	public:
-        _oox_drawing() : type(typeUnknown), id(0), x(0), y(0), cx(0), cy(0), sub_type(0), inGroup(false), name(L"object")
+        _oox_drawing() : type(typeUnknown), id(0), x(0), y(0), cx(0), cy(0), sub_type(0), inGroup(false), name(L"object"), extExternal(false)
         {
         }
         RelsType		type;
@@ -103,6 +103,7 @@ namespace oox {
 		std::wstring	objectProgId; 
 
 		std::wstring	extId;
+		bool			extExternal;
 
 		_action_desc				action;
 		std::vector<_hlink_desc>	hlinks;
@@ -118,7 +119,7 @@ namespace oox {
 	typedef _CP_PTR(_oox_drawing) oox_drawing_ptr;
 
 	void oox_serialize_ln		(std::wostream & strm, const std::vector<odf_reader::_property> & val, bool always_draw = false);
-	void oox_serialize_aLst		(std::wostream & strm, const std::vector<odf_reader::_property> & val);
+	void oox_serialize_aLst		(std::wostream & strm, const std::vector<odf_reader::_property> & val, const std::wstring & shapeGeomPreset);
     void oox_serialize_action	(std::wostream & strm, const _action_desc & val);
     
 }

ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp

@@ -37,7 +37,7 @@
 namespace cpdoccore {
 namespace oox {
 
-	oox_bitmap_fill::oox_bitmap_fill() : name_space(L"a"), bStretch(false), bCrop(false),bTile(false),isInternal(true)
+	oox_bitmap_fill::oox_bitmap_fill() : name_space(L"a"), bStretch(false), bCrop(false), bTile(false), isInternal(true)
 	{
 		memset(cropRect,0,sizeof(double)*4);
 	}
@@ -186,10 +186,10 @@ void oox_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val)
 			{
 				CP_XML_NODE(L"a:srcRect")
 				{
-					CP_XML_ATTR(L"l", static_cast<size_t>(val.bitmap->cropRect[0]*1000));
-					CP_XML_ATTR(L"t", static_cast<size_t>(val.bitmap->cropRect[1]*1000));
-					CP_XML_ATTR(L"r", static_cast<size_t>(val.bitmap->cropRect[2]*1000));
-					CP_XML_ATTR(L"b", static_cast<size_t>(val.bitmap->cropRect[3]*1000));
+					CP_XML_ATTR(L"l", static_cast<int>(val.bitmap->cropRect[0]*1000));
+					CP_XML_ATTR(L"t", static_cast<int>(val.bitmap->cropRect[1]*1000));
+					CP_XML_ATTR(L"r", static_cast<int>(val.bitmap->cropRect[2]*1000));
+					CP_XML_ATTR(L"b", static_cast<int>(val.bitmap->cropRect[3]*1000));
 				}
 			}
 			if (val.bitmap->bTile)

ASCOfficeOdfFile/src/docx/oox_drawing_fills.h

@@ -147,6 +147,6 @@ namespace oox {
     void oox_serialize_fill			(std::wostream & strm, const _oox_fill & val);
     void oox_serialize_srgb			(std::wostream & strm,std::wstring color,_CP_OPT(double)  opacity);
     void oox_serialize_srgb			(std::wostream & strm,std::wstring color,_CP_OPT(odf_types::percent)  opacity);
-
+	void oox_serialize_bitmap_fill	(std::wostream & strm, const _oox_fill & val);
 }
 }

ASCOfficeOdfFile/src/docx/oox_layout.cpp

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

ASCOfficeOdfFile/src/docx/oox_package.cpp

@@ -32,7 +32,6 @@
 
 #include "oox_package.h"
 
-#include <boost/foreach.hpp>
 #include <boost/ref.hpp>
 
 #include <cpdoccore/utf8cpp/utf8.h>
@@ -71,17 +70,19 @@ static std::wstring get_mime_type(const std::wstring & extension)
    	else if (L"tif" == extension)	return  L"image/x-tiff";
  	else if (L"tiff" == extension)	return  L"image/x-tiff";
 	else if (L"pdf" == extension)	return  L"application/pdf";
+	else if (L"bmp" == extension)	return  L"image/bmp";
 
 	else if (L"wav" == extension)	return  L"audio/wav";
 	else if (L"mp3" == extension)	return  L"audio/mpeg";
 	else if (L"wma" == extension)	return  L"audio/x-ms-wma";
 	else if (L"m4a" == extension)	return  L"audio/unknown";
 
-	else if (L"avi" == extension)	return  L"video/avi";
+	else if (L"avi" == extension)	return  L"video/x-msvideo";
 	else if (L"wmv" == extension)	return  L"video/x-ms-wmv";
 	else if (L"mov" == extension)	return  L"video/unknown";
 	else if (L"mp4" == extension)	return  L"video/unknown";
 	else if (L"m4v" == extension)	return  L"video/unknown";
+	else if (L"mkv" == extension)	return  L"video/unknown";
 
 	else if (L"bin" == extension)	return  L"application/vnd.openxmlformats-officedocument.oleObject";
 	else if (L"xlsx" == extension)	return  L"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";

ASCOfficeOdfFile/src/docx/oox_rels.cpp

@@ -32,7 +32,6 @@
 
 #include "oox_rels.h"
 #include <cpdoccore/xml/attributes.h>
-#include <boost/foreach.hpp>
 #include "namespaces.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
 

ASCOfficeOdfFile/src/docx/oox_title.cpp

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

ASCOfficeOdfFile/src/docx/oox_types_chart.cpp

@@ -30,12 +30,8 @@
  *
  */
 
-#include "oox_types_chart.h"
-
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/simple_xml_writer.h>
-
+#include "oox_types_chart.h"
 #include "oox_chart_shape.h"
 
 namespace cpdoccore {
@@ -104,15 +100,19 @@ void oox_chart::oox_serialize_common(std::wostream & _Wostream)
 				CP_XML_ATTR(L"val", grouping_);
 			}
 		}
-		BOOST_FOREACH(oox_series_ptr const & s, series_)
+		for (size_t i = 0; i < series_.size(); i++)
 		{
-			s->oox_serialize(_Wostream);
+			if (is3D_ || type_ == CHART_TYPE_AREA || type_ == CHART_TYPE_DOUGHNUT || type_ == CHART_TYPE_RADAR)
+			{
+				series_[i]->labelPosEnabled_ = false;
+			}
+			series_[i]->oox_serialize(_Wostream);
 		}
-		BOOST_FOREACH(int const & i, axisId_)
+		for (size_t i = 0; i < axisId_.size(); i++)
 		{
 			CP_XML_NODE(L"c:axId")
 			{	
-				CP_XML_ATTR(L"val", i);
+				CP_XML_ATTR(L"val", axisId_[i]);
 			}
 		}	
 		data_labels_.oox_serialize(_Wostream);
@@ -473,7 +473,7 @@ void oox_stock_chart::oox_serialize(std::wostream & _Wostream)
 			//{
 			//	//shape.oox_serialize(CP_XML_STREAM());
 			//}
-			CP_XML_NODE(L"upDownBars")
+			CP_XML_NODE(L"c:upDownBars")
 			{
 				CP_XML_NODE(L"c:gapWidth")
 				{

ASCOfficeOdfFile/src/docx/pptx_comments.cpp

@@ -31,7 +31,6 @@
  */
 
 #include "pptx_comments.h"
-#include <boost/foreach.hpp>
 #include <vector>
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "oox_rels.h"
@@ -53,23 +52,23 @@ public:
                 CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
                 CP_XML_ATTR(L"xmlns:p", L"http://schemas.openxmlformats.org/presentationml/2006/main");
 
-				BOOST_FOREACH(_pptx_comment const & c, pptx_comment_)
+				for (size_t i = 0; i < pptx_comment_.size(); i++)
 				{
 					CP_XML_NODE(L"p:cm")
 					{
-						CP_XML_ATTR(L"idx",c.idx_);
+						CP_XML_ATTR(L"idx", pptx_comment_[i].idx_);
 						
-						CP_XML_ATTR(L"authorId", c.author_id_);
-						CP_XML_ATTR(L"dt",	c.date_);
+						CP_XML_ATTR(L"authorId", pptx_comment_[i].author_id_);
+						CP_XML_ATTR(L"dt",	pptx_comment_[i].date_);
 						
 						CP_XML_NODE(L"p:pos")
 						{
-							CP_XML_ATTR(L"x", c.x_);
-							CP_XML_ATTR(L"y", c.y_);
+							CP_XML_ATTR(L"x", pptx_comment_[i].x_);
+							CP_XML_ATTR(L"y", pptx_comment_[i].y_);
 						}
 						CP_XML_NODE(L"p:text")
 						{
-							CP_XML_STREAM() << c.content_;
+							CP_XML_STREAM() << pptx_comment_[i].content_;
 						}
 					} 					
 				}

ASCOfficeOdfFile/src/docx/pptx_comments_context.cpp

@@ -31,7 +31,6 @@
  */
 
 #include "pptx_comments_context.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 #include "../odf/datatypes/length.h"
 #include "xlsx_utils.h"

ASCOfficeOdfFile/src/docx/pptx_drawing.cpp

@@ -150,15 +150,30 @@ void pptx_serialize_media(std::wostream & strm, _pptx_drawing & val)
 							CP_XML_NODE(L"p14:media")
 							{	
 								CP_XML_ATTR(L"xmlns:p14", L"http://schemas.microsoft.com/office/powerpoint/2010/main");
-								CP_XML_ATTR(L"r:embed",	val.extId);
+								if (val.extExternal)
+								{
+									CP_XML_ATTR(L"r:link",	val.extId);
+								}
+								else
+								{
+									CP_XML_ATTR(L"r:embed",	val.extId);
+								}
 							}
 						}
 					}
 				}
             } 
 			if (val.fill.bitmap)
+			{
 				val.fill.bitmap->name_space = L"p";
-			oox_serialize_fill(CP_XML_STREAM(), val.fill);
+				oox_serialize_bitmap_fill(strm, val.fill);
+				
+				val.fill.bitmap.reset();
+			}
+			else
+			{
+				 CP_XML_NODE(L"p:blipFill");
+			}
 
             CP_XML_NODE(L"p:spPr")
             {
@@ -169,7 +184,8 @@ void pptx_serialize_media(std::wostream & strm, _pptx_drawing & val)
                     CP_XML_ATTR(L"prst", L"rect");
                     CP_XML_NODE(L"a:avLst");
                 }
-				oox_serialize_ln(CP_XML_STREAM(), val.additional);
+				oox_serialize_fill	(CP_XML_STREAM(), val.fill);
+				oox_serialize_ln	(CP_XML_STREAM(), val.additional);
             } 			
 			//_CP_OPT(std::wstring) strTextContent;
 			//odf::GetProperty(properties,L"text-content",strTextContent);

ASCOfficeOdfFile/src/docx/pptx_drawings.cpp

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

ASCOfficeOdfFile/src/docx/pptx_output_xml.cpp

@@ -30,7 +30,6 @@
  *
  */
 #include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

@@ -30,7 +30,6 @@
  *
  */
 
-#include <boost/foreach.hpp>
 #include <iostream>
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include <cpdoccore/xml/utils.h>
@@ -473,6 +472,13 @@ void pptx_slide_context::set_media_param(std::wstring name, std::wstring value)
 
 void pptx_slide_context::set_image(const std::wstring & path)
 {
+	int pos_replaicement = path.find(L"ObjectReplacements"); 
+	if (pos_replaicement >= 0)
+	{
+		if (path.length() - (pos_replaicement + 18) < 2)
+			return; //object without image
+	}
+
 	if (impl_->object_description_.type_ == typeUnknown)
 	{
 		impl_->object_description_.type_		= typeImage;	
@@ -548,8 +554,9 @@ void pptx_slide_context::Impl::process_image(drawing_object_description& obj, _p
 	std::wstring ref;/// это ссылка на выходной внешний объект
 	bool isMediaInternal = false;
 	
-	drawing.fill.bitmap->rId = get_mediaitems().add_or_find(obj.xlink_href_, typeImage, isMediaInternal, ref);
-	
+	drawing.fill.bitmap->rId		= get_mediaitems().add_or_find(obj.xlink_href_, typeImage, isMediaInternal, ref);
+	drawing.fill.bitmap->isInternal	= isMediaInternal;
+
 	if (drawing.type == typeShape)
 	{
 		add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);//собственно это не объект, а доп рел и ref объекта
@@ -641,11 +648,12 @@ void pptx_slide_context::Impl::process_media(drawing_object_description& obj, _p
 
 	drawing.type = mediaitems::detectMediaType(obj.xlink_href_); //reset from Media to Audio, Video, ... QuickTime? AudioCD? ...   
 	
-	drawing.objectId = get_mediaitems().add_or_find(obj.xlink_href_, drawing.type, isMediaInternal, ref);    
-	drawing.extId	 = L"ext" + drawing.objectId;
+	drawing.objectId	= get_mediaitems().add_or_find(obj.xlink_href_, drawing.type, isMediaInternal, ref);    
+	drawing.extId		= L"ext" + drawing.objectId;
+	drawing.extExternal	= !isMediaInternal;
 	
 	add_drawing(drawing, false, drawing.objectId, L"NULL", drawing.type);
-	add_additional_rels( true, drawing.extId, ref, typeMedia);
+	add_additional_rels( isMediaInternal, drawing.extId, ref, typeMedia);
 
 	if (drawing.fill.bitmap)
 	{
@@ -745,10 +753,10 @@ void pptx_slide_context::serialize_animations(std::wostream & strm)
 				{
 					CP_XML_ATTR(L"spd",impl_->transition_.Speed.get());
 				}
-				if (impl_->transition_.Time)
+/*				if (impl_->transition_.Time)
 				{
 					CP_XML_ATTR(L"p14:dur", impl_->transition_.Time.get());
-				}	
+				}*/	
 				if (impl_->transition_.PageTime)
 				{
 					CP_XML_ATTR(L"advTm", impl_->transition_.PageTime.get());

ASCOfficeOdfFile/src/docx/pptx_table_context.cpp

@@ -30,7 +30,6 @@
  *
  */
 
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include <cpdoccore/xml/simple_xml_writer.h>
@@ -333,21 +332,34 @@ void oox_serialize_tcPr(std::wostream & strm, std::vector<const odf_reader::styl
 				}
 				if (style_cell_attlist.common_padding_attlist_.fo_padding_)
 				{
-					CP_XML_ATTR(L"marT", *style_cell_attlist.common_padding_attlist_.fo_padding_);
-					CP_XML_ATTR(L"marB", *style_cell_attlist.common_padding_attlist_.fo_padding_);
-					CP_XML_ATTR(L"marL", *style_cell_attlist.common_padding_attlist_.fo_padding_);
-					CP_XML_ATTR(L"marR", *style_cell_attlist.common_padding_attlist_.fo_padding_);
+					double padding = style_cell_attlist.common_padding_attlist_.fo_padding_->get_value_unit(odf_types::length::emu);
+					CP_XML_ATTR(L"marT", (long)padding);
+					CP_XML_ATTR(L"marB", (long)padding);
+					CP_XML_ATTR(L"marL", (long)padding);
+					CP_XML_ATTR(L"marR", (long)padding);
 				}
 				else
 				{
 					if (style_cell_attlist.common_padding_attlist_.fo_padding_top_)
-						CP_XML_ATTR(L"marT", *style_cell_attlist.common_padding_attlist_.fo_padding_top_);            
+					{
+						double padding = style_cell_attlist.common_padding_attlist_.fo_padding_top_->get_value_unit(odf_types::length::emu);
+						CP_XML_ATTR(L"marT", (long)padding);            
+					}
 					if (style_cell_attlist.common_padding_attlist_.fo_padding_bottom_)
-						CP_XML_ATTR(L"marB", *style_cell_attlist.common_padding_attlist_.fo_padding_bottom_);                        
+					{
+						double padding = style_cell_attlist.common_padding_attlist_.fo_padding_bottom_->get_value_unit(odf_types::length::emu);
+						CP_XML_ATTR(L"marB", (long)padding);                        
+					}
 					if (style_cell_attlist.common_padding_attlist_.fo_padding_left_)
-						CP_XML_ATTR(L"marL", *style_cell_attlist.common_padding_attlist_.fo_padding_left_);
+					{
+						double padding = style_cell_attlist.common_padding_attlist_.fo_padding_left_->get_value_unit(odf_types::length::emu);
+						CP_XML_ATTR(L"marL", (long)padding);
+					}
 					if (style_cell_attlist.common_padding_attlist_.fo_padding_right_)
-						CP_XML_ATTR(L"marR", *style_cell_attlist.common_padding_attlist_.fo_padding_right_);            
+					{
+						double padding = style_cell_attlist.common_padding_attlist_.fo_padding_right_->get_value_unit(odf_types::length::emu);
+						CP_XML_ATTR(L"marR", (long)padding);            
+					}
 				}			
 				//vert //
 				//style_cell_attlist.pptx_serialize(Context, CP_XML_STREAM());    //nodes        

ASCOfficeOdfFile/src/docx/pptx_text_context.cpp

@@ -36,7 +36,6 @@
 
 #include <iostream>
 #include <list>
-#include <boost/foreach.hpp>
 
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include <cpdoccore/odf/odf_document.h>

ASCOfficeOdfFile/src/docx/xlsx_border.cpp

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

ASCOfficeOdfFile/src/docx/xlsx_cell_format.cpp

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

ASCOfficeOdfFile/src/docx/xlsx_cell_styles.cpp

@@ -31,8 +31,6 @@
  */
 #include <vector>
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include "xlsx_cell_styles.h"
@@ -69,9 +67,9 @@ void xlsx_cell_styles::serialize(std::wostream & _Wostream) const
         {
             CP_XML_ATTR(L"count", impl_->cell_styles_.size());
 
-            BOOST_FOREACH(const xlsx_cell_style & s, impl_->cell_styles_)
-            {
-                oox::xlsx_serialize(CP_XML_STREAM(), s);                    
+   			for (size_t i = 0; i < impl_->cell_styles_.size(); i++)
+			{
+                oox::xlsx_serialize(CP_XML_STREAM(), impl_->cell_styles_[i]);                    
             }
         }
     }

ASCOfficeOdfFile/src/docx/xlsx_color.cpp

@@ -32,7 +32,6 @@
 
 #include <sstream>
 
-#include <boost/foreach.hpp>
 #include <boost/functional/hash/hash.hpp>
 
 #include "xlsx_font.h"

ASCOfficeOdfFile/src/docx/xlsx_comments_context.cpp

@@ -32,7 +32,6 @@
 
 #include "xlsx_comments_context.h"
 #include "xlsx_table_metrics.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 #include "../odf/datatypes/length.h"
 #include "xlsx_utils.h"

ASCOfficeOdfFile/src/docx/xlsx_complex_number_format.cpp

@@ -55,8 +55,8 @@ public:
 
     void add_format(std::wstring const & condition, std::wstring const & format)
     {
-        std::wstring c = condition;
-		XmlUtils::GetLower(c);
+        std::wstring c = XmlUtils::GetLower(condition);
+
         XmlUtils::replace_all( c, L" ", L"");
         XmlUtils::replace_all( c, L"\t", L"");
 

ASCOfficeOdfFile/src/docx/xlsx_conditionalFormatting.cpp

@@ -281,6 +281,11 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f)
 		impl_->conditionalFormattings_.back().rules.back().formula_type = L"expression";
 		impl_->conditionalFormattings_.back().rules.back().formula = converter.convert_named_expr(val);
 	}
+	else if (0 <= (pos = f.find(L"is-error")))
+	{
+		impl_->conditionalFormattings_.back().rules.back().formula_type = L"containsErrors";
+		impl_->conditionalFormattings_.back().rules.back().formula = L"0";
+	}
 	else if (0 <= (pos = f.find(L"duplicate")))
 	{
 		impl_->conditionalFormattings_.back().rules.back().formula_type = L"duplicateValues";

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

@@ -29,7 +29,6 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include <iostream>
@@ -300,6 +299,13 @@ void xlsx_drawing_context::set_ms_object(const std::wstring & path, const std::w
 }
 void xlsx_drawing_context::set_image(const std::wstring & path)
 {
+	int pos_replaicement = path.find(L"ObjectReplacements"); 
+	if (pos_replaicement >= 0)
+	{
+		if (path.length() - (pos_replaicement + 18) < 2)
+			return; //object without image
+	}
+
 	if (impl_->object_description_.type_ == typeUnknown)
 	{
 		impl_->object_description_.type_		= typeImage;	
@@ -515,7 +521,7 @@ void xlsx_drawing_context::process_position_properties(drawing_object_descriptio
 }
 
 
-void xlsx_drawing_context::process_image(drawing_object_description & obj,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
+void xlsx_drawing_context::process_image(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
 {
 	if (!drawing.fill.bitmap)
 	{
@@ -570,11 +576,31 @@ void xlsx_drawing_context::process_chart(drawing_object_description & obj,_xlsx_
 		impl_->get_drawings()->add(isMediaInternal, drawing.objectId, ref, obj.type_); // не объект
 }
 
-void xlsx_drawing_context::process_object(drawing_object_description & obj,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
+void xlsx_drawing_context::process_object(drawing_object_description & obj, xlsx_table_metrics & table_metrics,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
 {
 	std::wstring ref;
     bool isMediaInternal = true;
 	
+	if (drawing.type_anchor == 2) // absolute
+	{
+		//пересчет нужен для оле
+		xlsx_table_position from, to;
+		
+		process_position_properties	(obj, table_metrics, from, to);
+
+		drawing.from_.type				= xlsx_drawing_position::from;
+		drawing.from_.position.col		= from.col;
+		drawing.from_.position.colOff	= static_cast<size_t>(odf_types::length(from.colOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
+		drawing.from_.position.row		= from.row;
+		drawing.from_.position.rowOff	= static_cast<size_t>(odf_types::length(from.rowOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
+
+		drawing.to_.type				= xlsx_drawing_position::to;
+		drawing.to_.position.col		= to.col;
+		drawing.to_.position.colOff		= static_cast<size_t>(odf_types::length(to.colOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
+		drawing.to_.position.row		= to.row;
+		drawing.to_.position.rowOff		= static_cast<size_t>(odf_types::length(to.rowOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
+	}	
+	
 	drawing.objectId		= impl_->get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
 	drawing.objectProgId	= obj.descriptor_;
 
@@ -596,7 +622,7 @@ void xlsx_drawing_context::process_group(drawing_object_description & obj, xlsx_
 {
 	xlsx_drawings_ptr xlsx_drawings_child(xlsx_drawings::create(true));
 	
-	process_objects	( obj.child_objects_, table_metrics, xlsx_drawings_child);	
+	process_group_objects	( obj.child_objects_, table_metrics, xlsx_drawings_child);	
 	
 	std::wstringstream strm;
 
@@ -614,9 +640,9 @@ void xlsx_drawing_context::process_group(drawing_object_description & obj, xlsx_
 }
 void xlsx_drawing_context::process_objects(xlsx_table_metrics & table_metrics)
 {
-	process_objects(impl_->objects_, table_metrics, impl_->get_drawings());
+	process_group_objects(impl_->objects_, table_metrics, impl_->get_drawings());
 }
-void xlsx_drawing_context::process_objects(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_)
+void xlsx_drawing_context::process_group_objects(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_)
 {
 	for (size_t i = 0 ; i < objects.size(); i++)
 	{
@@ -655,7 +681,7 @@ void xlsx_drawing_context::process_objects(std::vector<drawing_object_descriptio
 			case typeGroupShape:	process_group	( obj, table_metrics, drawing, xlsx_drawings_);	break;
 			case typeMsObject:	
 			case typeOleObject:	
-									process_object	( obj, drawing, xlsx_drawings_);				break;
+									process_object	( obj, table_metrics, drawing, xlsx_drawings_);	break;
 		}
 	}
 }

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.h

@@ -133,13 +133,13 @@ private:
     class Impl;
     _CP_PTR(Impl) impl_;
 
-	void process_objects			(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_);
 	void process_group				(drawing_object_description & obj, xlsx_table_metrics & table_metrics, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
+	void process_group_objects		(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_);
   
 	void process_image				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
     void process_chart				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
     void process_shape				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
-    void process_object				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
+    void process_object				(drawing_object_description & obj, xlsx_table_metrics & table_metrics, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
 
 	void process_common_properties	(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_table_metrics & table_metrics);
 

ASCOfficeOdfFile/src/docx/xlsx_drawings.cpp

@@ -65,7 +65,7 @@ public:
 
 		if (sheet_rel)
 		{
-			for (int i = 0 ; i < xlsx_sheet_rels_.size(); i++)
+			for (size_t i = 0 ; i < xlsx_sheet_rels_.size(); i++)
 			{		
 				if (xlsx_sheet_rels_[i].rid == rid && xlsx_sheet_rels_[i].ref == ref)
 					present = true;
@@ -75,7 +75,7 @@ public:
 		}
 		else
 		{
-			for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
+			for (size_t i = 0 ; i < xlsx_drawing_rels_.size(); i++)
 			{		
 				if (xlsx_drawing_rels_[i].rid == rid && xlsx_drawing_rels_[i].ref == ref)
 					present = true;
@@ -89,7 +89,7 @@ public:
     {
 		if (inGroup)
 		{
-			for (int i = 0 ; i < xlsx_drawings_.size(); i++)
+			for (size_t i = 0 ; i < xlsx_drawings_.size(); i++)
 			{
 				xlsx_drawings_[i].serialize(strm);
 			}
@@ -114,7 +114,7 @@ public:
     }
 	void serialize_objects(std::wostream & strm) 
     {
-		for (int i = 0 ; i < xlsx_drawings_.size(); i++)
+		for (size_t i = 0 ; i < xlsx_drawings_.size(); i++)
 		{
 			if (xlsx_drawings_[i].type != typeOleObject && xlsx_drawings_[i].type != typeMsObject) continue;
 
@@ -129,7 +129,7 @@ public:
 
     void dump_rels_drawing(rels & Rels)
     {
-        for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
+        for (size_t i = 0 ; i < xlsx_drawing_rels_.size(); i++)
         {
 			if (xlsx_drawing_rels_[i].type == typeImage		|| 
 				xlsx_drawing_rels_[i].type == typeMedia		||
@@ -146,7 +146,7 @@ public:
     }
     void dump_rels_sheet(rels & Rels)
     {
-        for (int i = 0 ; i < xlsx_sheet_rels_.size(); i++)
+        for (size_t i = 0 ; i < xlsx_sheet_rels_.size(); i++)
         {
 			Rels.add(relationship( xlsx_sheet_rels_[i].rid,
 						mediaitems::get_rel_type(xlsx_sheet_rels_[i].type),

ASCOfficeOdfFile/src/docx/xlsx_fills.cpp

@@ -175,13 +175,6 @@ void xlsx_fills::serialize(std::wostream & _Wostream) const
             }
         }
     }
-
-    //_Wostream << L"<fills count=\"" << inst_array.size() << L"\" >";
-    //BOOST_FOREACH(const xlsx_fill & f, inst_array)
-    //{
-    //    ::cpdoccore::oox::xlsx_serialize(_Wostream, f);
-    //}
-    //_Wostream << L"</fills>";    
 }
 
 }

ASCOfficeOdfFile/src/docx/xlsx_hyperlinks.cpp

@@ -30,9 +30,6 @@
  *
  */
 
-#include <boost/lexical_cast.hpp>
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include "xlsx_hyperlinks.h"
@@ -60,11 +57,12 @@ public:
 	
 	void dump_rels(rels & Rels) const
 	{
-		BOOST_FOREACH(const record & rec, records_)
+		for (size_t i = 0; i < records_.size(); i++)
 		{
-			if (rec.type == L"External")
+			if (records_[i].type == L"External")
 			{
-				Rels.add( relationship(rec.id, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", rec.location, rec.type) );
+				Rels.add( relationship(records_[i].id, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", 
+					records_[i].location, records_[i].type) );
 			}
 		}
 	}
@@ -109,23 +107,23 @@ public:
 
     void xlsx_serialize(std::wostream & _Wostream) const
     {
-        BOOST_FOREACH(record const & r, records_)
+		for (size_t i = 0; i < records_.size(); i++)
         {
             CP_XML_WRITER(_Wostream)
             {
                 CP_XML_NODE(L"hyperlink")
                 {
-                    CP_XML_ATTR(L"ref", r.ref);
-                    CP_XML_ATTR(L"display", r.display);
+                    CP_XML_ATTR(L"ref", records_[i].ref);
+                    CP_XML_ATTR(L"display", records_[i].display);
                   
-					if (!r.location.empty() && r.type == L"Internal")
+					if (!records_[i].location.empty() && records_[i].type == L"Internal")
                     {
-                        CP_XML_ATTR(L"location", r.location);
+                        CP_XML_ATTR(L"location", records_[i].location);
                     }
 
-                    if (!r.id.empty() && r.type == L"External")
+                    if (!records_[i].id.empty() && records_[i].type == L"External")
                     {
-                        CP_XML_ATTR(L"r:id", r.id);                    
+                        CP_XML_ATTR(L"r:id", records_[i].id);                    
                     }
                 }
             }