[pe][ios] Apply timing to all

.gitignore

@@ -35,7 +35,6 @@ Common/3dParty/openssl/openssl
 .idea
 .svn
 .DS_Store
-.qmake.stash
 Thumbs.db
 *.xcuserstate
 *.xcuserdatad
@@ -47,8 +46,6 @@ ASCOfficeXlsFile2/win32/_ASCOfficeXlsFile2_p.c
 ASCOfficeXlsFile2/win32/dlldata.c
 OfficeUtils/win32/OfficeUtilsLib/OfficeUtilsLib/ReadMe.txt
 X2tConverter/**/Makefile.*
-X2tConverter/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/Makefile
-X2tConverter/Common/DocxFormat/DocxFormatLib/Makefile
 *.7z
 *.obj
 *.pdb
@@ -58,4 +55,3 @@ X2tConverter/Common/DocxFormat/DocxFormatLib/Makefile
 *.zip
 *.tar.gz
 **/*.build/
-

ASCOfficeDocFile/Common/FormatUtils.h

@@ -54,7 +54,6 @@
 
 #include "../../DesktopEditor/common/Types.h"
 #include "../../Common/DocxFormat/Source/Base/unicode_util.h"
-#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 #include "../../UnicodeConverter/UnicodeConverter.h"
 
 #include <boost/format.hpp>

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

@@ -58,8 +58,7 @@ namespace DocFileFormat
 		}
 		else
 		{
-			short cch = reader->ReadInt16(); 
-
+			short cch = reader->ReadInt16();
 
 			unsigned char *chars = reader->ReadBytes(18, true);
 
@@ -68,34 +67,13 @@ namespace DocFileFormat
 			newObject->m_AuthorIndex = reader->ReadUInt16();
 
 			//skip 4 bytes
-			unsigned int skip = reader->ReadUInt32();
+			reader->ReadBytes(4, false);
 
-			newObject->m_BookmarkId = reader->ReadInt32(); //-1 - comment is on a length zero text range in the Main Document
+			newObject->m_BookmarkId = reader->ReadInt32();
 			RELEASEARRAYOBJECTS(chars);
 		}
 
 
-		return static_cast<ByteStructure*>(newObject);
-	}
-	ByteStructure* AnnotationReferenceExDescriptor::ConstructObject(VirtualStreamReader* reader, int length)
-	{
-		AnnotationReferenceExDescriptor *newObject = new AnnotationReferenceExDescriptor();
-
-		if (reader->nWordVersion > 0)
-		{
-
-		}
-		else
-		{
-			m_nDTTM					= reader->ReadUInt32(); 
-			reader->ReadUInt16(); //padding1
-			m_nDepth				= reader->ReadUInt32(); 
-			m_nDiatrdParent			= reader->ReadUInt32(); 
-			unsigned int flag		= reader->ReadUInt32(); 
-			m_fInkAtn = GETBIT(flag, 1);
-		}
-
-
 		return static_cast<ByteStructure*>(newObject);
 	}
 }

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.h

@@ -46,6 +46,21 @@ namespace DocFileFormat
 			return (nWordVersion > 0) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
 		}
 
+		inline std::wstring GetUserInitials() const
+		{
+			return m_UserInitials;
+		}
+
+		inline unsigned short GetAuthorIndex() const
+		{
+			return m_AuthorIndex;
+		}
+
+		inline int GetBookmarkId() const
+		{
+			return m_BookmarkId;
+		}
+
         AnnotationReferenceDescriptor() : m_AuthorIndex(0), m_BookmarkId(0)
 		{
 		}
@@ -56,35 +71,13 @@ namespace DocFileFormat
 
         virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
 
+	private:
+
+		/// The initials of the user who left the annotation.
 		std::wstring	m_UserInitials;
+		/// An index into the string table of comment author names.
 		unsigned short	m_AuthorIndex;
+		/// Identifies a bookmark.
 		int				m_BookmarkId;
 	};
-
-	class AnnotationReferenceExDescriptor: public ByteStructure
-	{
-	public:
-		static const int STRUCTURE_SIZE = 18;
-		static const int STRUCTURE_SIZE_OLD = 0;
-
-		static const int GetSize(int nWordVersion)
-		{
-			return (nWordVersion > 0) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
-		}
-
-        AnnotationReferenceExDescriptor() : m_nDTTM(0), m_nDepth(0), m_nDiatrdParent(0), m_fInkAtn(false)
-		{
-		}
-
-		virtual ~AnnotationReferenceExDescriptor() 
-		{
-		}
-
-        virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
-
-		unsigned int	m_nDTTM;
-		unsigned int	m_nDepth;
-		unsigned int	m_nDiatrdParent;
-		bool			m_fInkAtn;
-	};
 }

ASCOfficeDocFile/DocDocxConverter/BookmarkFirst.h

@@ -39,8 +39,13 @@ namespace DocFileFormat
   class BookmarkFirst: public ByteStructure
   {
     private:
-		short ibkl;
-		short bkc;
+      /// An unsigned integer that specifies a zero-based index into the PlcfBkl or PlcfBkld 
+      /// that is paired with the PlcfBkf  or PlcfBkfd containing this FBKF.
+      /// The entry found at said index specifies the location of the end of the bookmark associated with this FBKF.
+      /// Ibkl MUST be unique for all FBKFs inside a given PlcfBkf or PlcfBkfd.
+      short ibkl;
+      /// A BKC that specifies further information about the bookmark associated with this FBKF.
+      short bkc;
 
     public:
       static const int STRUCTURE_SIZE = 4;
@@ -73,32 +78,4 @@ namespace DocFileFormat
 	    return static_cast<ByteStructure*>( newObject );
       }
   };
-  class AtnBookmarkFirst: public ByteStructure
-  {
-public:
-	unsigned short	bmc;
-	unsigned int	lTag;
-
-	static const int STRUCTURE_SIZE = 10;
-
-	  AtnBookmarkFirst()
-	  {
-	  }
-
-	  virtual ~AtnBookmarkFirst()
-	  {
-	  }
-
-      virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length )
-      {
-        AtnBookmarkFirst *newObject = new AtnBookmarkFirst();
-
-	    newObject->bmc = reader->ReadUInt16(); //0x0100
-        newObject->lTag = reader->ReadUInt32();
-        
-		unsigned int lTagOld = reader->ReadUInt32();
-
-	    return static_cast<ByteStructure*>( newObject );
-      }
-  };
 }

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -75,7 +75,7 @@ namespace DocFileFormat
 		convertSprms( dynamic_cast<CharacterPropertyExceptions*>( chpx )->grpprl, _rPr );
 
 		// apend revision changes
-		if ((_revisionData) && (_revisionData->Type == Changed))
+		if (_revisionData->Type == Changed)
 		{
             XMLTools::XMLElement rPrChange( L"w:rPrChange");
 

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -52,6 +52,8 @@ namespace DocFileFormat
 			{
 				m_context->_docx->RegisterComments();
 
+				int index = 0; 
+
                 m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
                 m_pXmlWriter->WriteNodeBegin( L"w:comments", TRUE );
 
@@ -61,60 +63,33 @@ namespace DocFileFormat
                 m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
                 m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
                 m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
-                m_pXmlWriter->WriteAttribute( L"xmlns:wpc", L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" ); 
-                m_pXmlWriter->WriteAttribute( L"xmlns:cx", L"http://schemas.microsoft.com/office/drawing/2014/chartex"  );
-                m_pXmlWriter->WriteAttribute( L"xmlns:cx1", L"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex"  );
-                m_pXmlWriter->WriteAttribute( L"xmlns:mc", L"http://schemas.openxmlformats.org/markup-compatibility/2006" );
-                m_pXmlWriter->WriteAttribute( L"xmlns:m", L"http://schemas.openxmlformats.org/officeDocument/2006/math" );
-                m_pXmlWriter->WriteAttribute( L"xmlns:wp14", L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" );
-                m_pXmlWriter->WriteAttribute( L"xmlns:wp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" );
-                m_pXmlWriter->WriteAttribute( L"xmlns:w14", L"http://schemas.microsoft.com/office/word/2010/wordml" );
-                m_pXmlWriter->WriteAttribute( L"xmlns:w15", L"http://schemas.microsoft.com/office/word/2012/wordml" );
-                m_pXmlWriter->WriteAttribute( L"xmlns:w16se", L"http://schemas.microsoft.com/office/word/2015/wordml/symex" );
-                m_pXmlWriter->WriteAttribute( L"xmlns:wpg", L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" );
-                m_pXmlWriter->WriteAttribute( L"xmlns:wpi", L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk" );
-                m_pXmlWriter->WriteAttribute( L"xmlns:wne", L"http://schemas.microsoft.com/office/word/2006/wordml" );
-                m_pXmlWriter->WriteAttribute( L"xmlns:wps", L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape" );
-                m_pXmlWriter->WriteAttribute( L"mc:Ignorable", L"w14 w15 w16se wp14");
-
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				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 (size_t index = 0; index < count; ++index)
+				for (size_t i = 0; i < count; ++i)
 				{   
 					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
-					AnnotationReferenceExDescriptor* atrdPost10 = m_document->AnnotationsReferenceExPlex ? static_cast<AnnotationReferenceExDescriptor*>(m_document->AnnotationsReferenceExPlex->Elements[index]) : NULL;
 
+					unsigned short index_author = atrdPre10->GetAuthorIndex();
                     m_pXmlWriter->WriteNodeBegin( L"w:comment", TRUE );
-					if (atrdPre10->m_BookmarkId < 0)
-					{
-						m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 + count + 1024 ));
-					}
-					else
-					{
-						m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 ));
-					}
-					if (atrdPost10)
-					{
-						//!!!TODO!!!
-						/*//ATRDpost10 is optional and not saved in all files
-						if (doc.AnnotationReferenceExtraTable != null && 
-						doc.AnnotationReferenceExtraTable.Count > index)
-						{
-						AnnotationReferenceDescriptorExtra atrdPost10 = doc.AnnotationReferenceExtraTable[index];
-						atrdPost10.Date.Convert(new DateMapping(_writer));
-						}*/	
-					}
-					if (atrdPre10->m_AuthorIndex < m_document->AnnotationOwners->size())	//conv_253l2H1CehgKwsxCtNk__docx.doc
+                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 ));
+					if (index_author < m_document->AnnotationOwners->size())	//conv_253l2H1CehgKwsxCtNk__docx.doc
 					{
 						m_pXmlWriter->WriteAttribute( L"w:author",
-							FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->m_AuthorIndex ) ));
+							FormatUtils::XmlEncode(m_document->AnnotationOwners->at( index_author ) ));
 					}
-                    m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->m_UserInitials);
-
+                    m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->GetUserInitials());
 
+					//!!!TODO!!!
+					/*//ATRDpost10 is optional and not saved in all files
+					if (doc.AnnotationReferenceExtraTable != null && 
+					doc.AnnotationReferenceExtraTable.Count > index)
+					{
+					AnnotationReferenceDescriptorExtra atrdPost10 = doc.AnnotationReferenceExtraTable[index];
+					atrdPost10.Date.Convert(new DateMapping(_writer));
+					}*/
 
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
@@ -141,6 +116,8 @@ namespace DocFileFormat
 					}
 
                     m_pXmlWriter->WriteNodeEnd(L"w:comment" );
+
+					++index;
 				}
 
                 m_pXmlWriter->WriteNodeEnd( L"w:comments" );

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

@@ -61,7 +61,7 @@ namespace DocFileFormat
 
 namespace DocFileFormat
 {
-	_UINT32 Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
+	long Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
 	{
 		if (!doc || !docx) return S_FALSE;
 		
@@ -202,18 +202,20 @@ namespace DocFileFormat
 		return S_OK;
 	}
 
-	_UINT32 Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
+	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
 	{
+        long result = S_FALSE;
+
 		WordDocument			doc(progress, m_sTempFolder);
 		WordprocessingDocument	docx(strDstDirectory, &doc);
 		
-		_UINT32 result = doc.LoadDocument(strSrcFile, password);
+		result = doc.LoadDocument(strSrcFile, password);
 
-        if (result == 0)
+        if (result == S_OK)
 		{
 			result = Convert(&doc, &docx, progress);
 
-            if (result == 0)
+            if (result == S_OK)
 			{
 				docx.SaveDocument(bMacros);
 

ASCOfficeDocFile/DocDocxConverter/Converter.h

@@ -32,7 +32,6 @@
 #pragma once
 
 #include <string>
-#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 
 struct ProgressCallback;
 
@@ -49,9 +48,9 @@ namespace DocFileFormat
 
 		std::wstring m_sTempFolder;
 
-		_UINT32 LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
+		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
 	
 	private:
-		_UINT32 Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	
+		long Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	
 	};
 }

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -45,7 +45,7 @@ namespace DocFileFormat
 {
 	DocumentMapping::DocumentMapping(ConversionContext* context, IMapping* caller) : _skipRuns(0), _lastValidPapx(NULL), _lastValidSepx(NULL),
 		AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() ), _sectionNr(0), _footnoteNr(0),
-		_endnoteNr(0), _commentNr(1), _caller(caller)
+		_endnoteNr(0), _commentNr(0), _caller(caller)
 	{
 		m_document				=	NULL;
 		m_context				=	context;
@@ -484,266 +484,6 @@ namespace DocFileFormat
 		return result_cp;
 	}
 
-	void DocumentMapping::writeField(const std::wstring& sFieldString, int cpFieldStart, int cpFieldEnd)
-	{
-		_fieldLevels.push_back(fieldLevels());
-		
-		std::vector<std::wstring> arField;
-		boost::algorithm::split(arField, sFieldString, boost::algorithm::is_any_of(L"\\"), boost::algorithm::token_compress_on);
-		
-		std::wstring f;
-		std::wstring EMBED		( L"EMBED" );
-		std::wstring embed		( L"embed" );
-		std::wstring LINK		( L"LINK" );
-        std::wstring FORM		( L"FORM" );
-        std::wstring Excel		( L"Excel" );
-        std::wstring Word		( L"Word" );
-        std::wstring opendocument(L"opendocument" );
-        std::wstring Equation	( L"Equation" );
-        std::wstring MERGEFORMAT( L"MERGEFORMAT" );
-        std::wstring QUOTE		( L"QUOTE" );
-        std::wstring chart		( L"Chart" );
-        std::wstring PBrush		( L"PBrush" );
-        std::wstring TOC		( L"TOC" );
-        std::wstring HYPERLINK	( L"HYPERLINK" );
-        std::wstring PAGEREF	( L"PAGEREF" );
-        std::wstring PAGE		( L"PAGE" );
-        std::wstring SHAPE		( L"SHAPE" );
-
-		if (arField.empty() == false)
-			f = arField[0];
-		else
-			f = sFieldString;
-
-		bool bChart			= search( f.begin(), f.end(), chart.begin(),		chart.end())			!= f.end();
-		bool bEMBED			= search( f.begin(), f.end(), EMBED.begin(),		EMBED.end())			!= f.end() ||
-							  search( f.begin(), f.end(), embed.begin(),		embed.end())			!= f.end();
-		bool bLINK			= search( f.begin(), f.end(), LINK.begin(),			LINK.end())				!= f.end();
-		bool bOpendocument	= search( f.begin(), f.end(), opendocument.begin(), opendocument.end())		!= f.end();
-		bool bFORM			= search( f.begin(), f.end(), FORM.begin(),			FORM.end())				!= f.end();
-		bool bMERGEFORMAT	= search( f.begin(), f.end(), MERGEFORMAT.begin(),	MERGEFORMAT.end())		!= f.end();
-		bool bExcel			= search( f.begin(), f.end(), Excel.begin(),		Excel.end())			!= f.end();
-		bool bWord			= search( f.begin(), f.end(), Word.begin(),			Word.end())				!= f.end();
-		bool bHYPERLINK		= search( f.begin(), f.end(), HYPERLINK.begin(),	HYPERLINK.end())		!= f.end();
-		bool bQUOTE			= search( f.begin(), f.end(), QUOTE.begin(),		QUOTE.end())			!= f.end();
-		bool bEquation		= search( f.begin(), f.end(), Equation.begin(),		Equation.end())			!= f.end();
-		bool bPAGE			= search( f.begin(), f.end(), PAGE.begin(),			PAGE.end())				!= f.end();
-		bool bTOC			= search( f.begin(), f.end(), TOC.begin(),			TOC.end())				!= f.end();
-		bool bSHAPE			= search( f.begin(), f.end(), SHAPE.begin(),		SHAPE.end())				!= f.end();
-		
-		bool bPAGEREF = false; 
-		if (bHYPERLINK && arField.size() > 1)
-		{
-			std::wstring f1 = arField[1];
-			bPAGEREF	= search( f1.begin(), f1.end(), PAGEREF.begin(), PAGEREF.end())	!= f1.end();
-		}			
-
-		if (bTOC)
-			_bContentWrite = true;
-
-		if ( bFORM )
-		{
-			std::wstring FORMTEXT		( L" FORMTEXT" );
-			std::wstring FORMCHECKBOX	( L" FORMCHECKBOX" );
-			std::wstring FORMDROPDOWN	( L" FORMDROPDOWN" );
-			
-			m_pXmlWriter->WriteNodeBegin( L"w:fldChar" , true );
-            m_pXmlWriter->WriteAttribute( L"w:fldCharType" , L"begin" );
-            m_pXmlWriter->WriteNodeEnd( L"", true, false );
-
-			bool bFORMTEXT		= search( f.begin(), f.end(), FORMTEXT.begin(),		FORMTEXT.end())	!= f.end();
-			bool bFORMCHECKBOX	= search( f.begin(), f.end(), FORMCHECKBOX.begin(),	FORMCHECKBOX.end())	!= f.end();
-			bool bFORMDROPDOWN	= search( f.begin(), f.end(), FORMDROPDOWN.begin(),	FORMDROPDOWN.end())	!= f.end();
-
-			if (bFORMTEXT || bFORMCHECKBOX || bFORMDROPDOWN)
-			{
-				int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
-				if (cpPic < cpFieldEnd)
-				{
-					int fcPic = m_document->FindFileCharPos( cpPic );
-					std::list<CharacterPropertyExceptions*>* chpxs	= m_document->GetCharacterPropertyExceptions(fcPic, fcPic + 1); 
-
-					if (chpxs)
-					{
-						CharacterPropertyExceptions* chpxSep = chpxs->front();
-						
-						FormFieldData ffdata (2, chpxSep, m_document->DataStream, false);
-						FormFieldDataMapping data_mapping(m_pXmlWriter, m_context, _caller);
-						ffdata.Convert(&data_mapping);
-						
-						RELEASEOBJECT( chpxs );
-					}
-				}
-			}
-
-            m_pXmlWriter->WriteNodeEnd( L"w:fldChar" );
-
-			_fieldLevels.back().bBegin = true;
-		}
-		else if ( ( bMERGEFORMAT || bExcel || bWord || bOpendocument )
-				&& 
-				( ( bEMBED || bLINK ) && bChart) )
-		{
-            m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
-                m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
-            m_pXmlWriter->WriteNodeEnd( L"", true, false );
-
-			int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
-
-            m_pXmlWriter->WriteNodeEnd( L"w:fldChar" );
-
-			_fieldLevels.back().bBegin = true;
-		}
-		else if (bHYPERLINK && bPAGEREF)
-		{
-			int cpFieldSep2 = cpFieldStart, cpFieldSep1 = cpFieldStart;
-			std::vector<std::wstring> toc;
-
-			if (arField.size() > 1)
-				f = arField[1];
-
-			if ( _bContentWrite )
-			{
-				m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
-					m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
-				m_pXmlWriter->WriteNodeEnd( L"", true );
-
-				_fieldLevels.back().bBegin = true;
-			}
-			else
-			{
-				for (size_t i = 1; i < arField.size(); i++)
-				{
-					std::wstring f1 = arField[1];
-					int d = (int)f1.find(PAGEREF);
-
-					if (d > 0)
-					{
-						_writeWebHidden = true;
-						std::wstring _writeTocLink =f1.substr(d + 9);
-						d = (int)_writeTocLink.find(L" ");
-						_writeTocLink = _writeTocLink.substr(0, d);
-						
-						_writeAfterRun	=	std::wstring (L"<w:hyperlink w:anchor = \"");
-						_writeAfterRun +=	_writeTocLink;
-						_writeAfterRun +=	std::wstring (L"\" w:history=\"1\">");
-
-						break;								
-						//cp = cpFieldSep1;
-					}
-					//cpFieldSep1 = cpFieldSep2;
-				}
-				_skipRuns = 5; //with separator
-			}
-		}
-		else if ( bEMBED ||	(bLINK && !bHYPERLINK)|| bQUOTE)						
-		{
-			int cpPic		=	searchNextTextMark(m_document->Text, cpFieldStart,	TextMark::Picture);
-			int cpFieldSep	=	searchNextTextMark(m_document->Text, cpFieldStart,	TextMark::FieldSeparator);
-
-			if (cpPic < cpFieldEnd)
-			{
-				int fcPic = m_document->FindFileCharPos( cpPic );
-				std::list<CharacterPropertyExceptions*>* chpxs	=	m_document->GetCharacterPropertyExceptions(fcPic, fcPic + 1); 
-				
-				CharacterPropertyExceptions* chpxObj =	chpxs->front();
-
-				RevisionData oData = RevisionData(chpxObj);
-
-				CharacterPropertiesMapping* rPr = new CharacterPropertiesMapping(m_pXmlWriter, m_document, &oData, _lastValidPapx, false);
-				if(rPr)
-				{
-					chpxObj->Convert(rPr);
-					RELEASEOBJECT(rPr);
-				}					
-				XMLTools::CStringXmlWriter	oleWriter;
-				XMLTools::CStringXmlWriter	oleObjectWriter;
-				
-				VMLPictureMapping	oVmlMapper (m_context, &oleWriter, true, _caller);
-
-				if (!m_shapeIdOwner.empty())		//4571833.doc
-					oVmlMapper.m_shapeId = m_shapeIdOwner;
-
-				if (m_document->nWordVersion > 0)
-				{							
-					OleObject ole ( chpxObj, m_document);
-					
-                    oleWriter.WriteNodeBegin (L"w:object", true);
-                        oleWriter.WriteAttribute( L"w:dxaOrig", FormatUtils::IntToWideString( ( ole.pictureDesciptor.dxaGoal + ole.pictureDesciptor.dxaOrigin ) ));
-                        oleWriter.WriteAttribute( L"w:dyaOrig", FormatUtils::IntToWideString( ( ole.pictureDesciptor.dyaGoal + ole.pictureDesciptor.dyaOrigin ) ));
-                    oleWriter.WriteNodeEnd( L"", true, false );
-
-					ole.pictureDesciptor.Convert(&oVmlMapper);
-					OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &ole.pictureDesciptor, _caller, oVmlMapper.m_shapeId);
-					
-					ole.Convert( &oleObjectMapping );
-
-					_lastOLEObject = oleObjectWriter.GetXmlString();
-				}
-				else
-				{
-					PictureDescriptor pic(chpxObj, m_document->DataStream, 0x7fffffff, m_document->nWordVersion);
-					
-                    oleWriter.WriteNodeBegin (L"w:object", true);
-                        oleWriter.WriteAttribute( L"w:dxaOrig", FormatUtils::IntToWideString( ( pic.dxaGoal + pic.dxaOrigin ) ) );
-                        oleWriter.WriteAttribute( L"w:dyaOrig", FormatUtils::IntToWideString( ( pic.dyaGoal + pic.dyaOrigin ) ) );
-                    oleWriter.WriteNodeEnd( L"", true, false );
-					
-					pic.Convert(&oVmlMapper);
-					RELEASEOBJECT(chpxs);
-
-					if ( cpFieldSep < cpFieldEnd  && m_document->m_PieceTable)
-					{
-						int fcFieldSep = m_document->m_PieceTable->FileCharacterPositions->operator []( cpFieldSep );
-						int fcFieldSep1 = m_document->FindFileCharPos( cpFieldSep );
-						
-						std::list<CharacterPropertyExceptions*>* chpxs = m_document->GetCharacterPropertyExceptions( fcFieldSep, ( fcFieldSep + 1 ) ); 
-						CharacterPropertyExceptions* chpxSep = chpxs->front();
-						
-						OleObject ole ( chpxSep, m_document);
-						OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &pic, _caller, oVmlMapper.m_shapeId );
-						
-						if (oVmlMapper.m_isEmbedded)
-						{
-							ole.isEquation		= oVmlMapper.m_isEquation;
-							ole.isEmbedded		= oVmlMapper.m_isEmbedded;
-							ole.emeddedData		= oVmlMapper.m_embeddedData;
-						}
-						ole.Convert( &oleObjectMapping );
-
-						_lastOLEObject = oleObjectWriter.GetXmlString();
-						
-						RELEASEOBJECT( chpxs );
-					}
-				}
-				oleWriter.WriteString( _lastOLEObject );
-                oleWriter.WriteNodeEnd( L"w:object" );
-
-				if (!oVmlMapper.m_isEmbedded && oVmlMapper.m_isEquation)
-				{
-					//нельзя в Run писать oMath
-					//m_pXmlWriter->WriteString(oVmlMapper.m_equationXml);
-					_writeAfterRun = oVmlMapper.m_equationXml;
-				}
-				else
-				{
-					m_pXmlWriter->WriteString(oleWriter.GetXmlString());
-				}	
-			}
-
-			_skipRuns		= 3;
-			_embeddedObject	= true;
-		}					
-		else
-		{
-            m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
-                m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
-            m_pXmlWriter->WriteNodeEnd( L"", true );
-
-			_fieldLevels.back().bBegin = true;
-		}
-	}
-
 	// Writes the given text to the document
 	int DocumentMapping::writeText(std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText)
 	{
@@ -766,7 +506,7 @@ namespace DocFileFormat
 		}
 
 		//write text
-		for (size_t i = 0; i < chars->size(); ++i)
+		for (unsigned int i = 0; i < chars->size(); ++i)
 		{
 			wchar_t c = chars->at(i), code = c;
 
@@ -786,20 +526,7 @@ namespace DocFileFormat
 
                 text.clear();
 
-				if (textType == L"instrText")
-				{
-					m_pXmlWriter->WriteNodeEnd(L"w:r");
-					m_pXmlWriter->WriteNodeBegin(L"w:r");
-					CharacterPropertiesMapping* rPr = new CharacterPropertiesMapping(m_pXmlWriter, m_document, NULL, _lastValidPapx, false);
-					if (rPr)
-					{
-						rPr->_webHidden = _writeWebHidden;
-						
-						chpx->Convert(rPr);
-						RELEASEOBJECT(rPr);
-					}
-				}
-				XMLTools::XMLElement elem(L"w:br");
+                XMLTools::XMLElement elem(L"w:br");
                 elem.AppendAttribute(L"w:type", L"textWrapping");
                 elem.AppendAttribute(L"w:clear", L"all");
 
@@ -836,15 +563,287 @@ namespace DocFileFormat
 			}
 			else if (TextMark::FieldBeginMark == code)
 			{
+				_fieldLevels.push_back(fieldLevels());
+
 				int cpFieldStart = initialCp + i;
 				int cpFieldEnd = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::FieldEndMark );
 				
-				std::wstring sFieldString;
+				std::wstring f, sFieldString;
 				if (cpFieldEnd < (int)m_document->Text->size())
 					sFieldString = std::wstring( ( m_document->Text->begin() + cpFieldStart ), ( m_document->Text->begin() + cpFieldEnd + 1 ) );
 
-				writeField(sFieldString, cpFieldStart, cpFieldEnd);
+				std::vector<std::wstring> arField;
+				boost::algorithm::split(arField, sFieldString, boost::algorithm::is_any_of(L"\\"), boost::algorithm::token_compress_on);
+				
+				std::wstring EMBED		( L"EMBED" );
+  				std::wstring embed		( L"embed" );
+				std::wstring LINK		( L"LINK" );
+                std::wstring FORM		( L"FORM" );
+                std::wstring Excel		( L"Excel" );
+                std::wstring Word		( L"Word" );
+                std::wstring opendocument(L"opendocument" );
+                std::wstring Equation	( L"Equation" );
+                std::wstring MERGEFORMAT( L"MERGEFORMAT" );
+                std::wstring QUOTE		( L"QUOTE" );
+                std::wstring chart		( L"Chart" );
+                std::wstring PBrush		( L"PBrush" );
+                std::wstring TOC		( L"TOC" );
+                std::wstring HYPERLINK	( L"HYPERLINK" );
+                std::wstring PAGEREF	( L"PAGEREF" );
+                std::wstring PAGE		( L"PAGE" );
 
+				if (arField.empty() == false)
+					f = arField[0];
+				else
+					f = sFieldString;
+
+				bool bChart			= search( f.begin(), f.end(), chart.begin(),		chart.end())			!= f.end();
+				bool bEMBED			= search( f.begin(), f.end(), EMBED.begin(),		EMBED.end())			!= f.end() ||
+									  search( f.begin(), f.end(), embed.begin(),		embed.end())			!= f.end();
+				bool bLINK			= search( f.begin(), f.end(), LINK.begin(),			LINK.end())				!= f.end();
+				bool bOpendocument	= search( f.begin(), f.end(), opendocument.begin(), opendocument.end())		!= f.end();
+				bool bFORM			= search( f.begin(), f.end(), FORM.begin(),			FORM.end())				!= f.end();
+				bool bMERGEFORMAT	= search( f.begin(), f.end(), MERGEFORMAT.begin(),	MERGEFORMAT.end())		!= f.end();
+				bool bExcel			= search( f.begin(), f.end(), Excel.begin(),		Excel.end())			!= f.end();
+				bool bWord			= search( f.begin(), f.end(), Word.begin(),			Word.end())				!= f.end();
+				bool bHYPERLINK		= search( f.begin(), f.end(), HYPERLINK.begin(),	HYPERLINK.end())		!= f.end();
+				bool bQUOTE			= search( f.begin(), f.end(), QUOTE.begin(),		QUOTE.end())			!= f.end();
+				bool bEquation		= search( f.begin(), f.end(), Equation.begin(),		Equation.end())			!= f.end();
+				bool bPAGE			= search( f.begin(), f.end(), PAGE.begin(),			PAGE.end())				!= f.end();
+				bool bTOC			= search( f.begin(), f.end(), TOC.begin(),			TOC.end())				!= f.end();
+				
+				bool bPAGEREF = false; 
+				if (bHYPERLINK && arField.size() > 1)
+				{
+					std::wstring f1 = arField[1];
+					bPAGEREF	= search( f1.begin(), f1.end(), PAGEREF.begin(), PAGEREF.end())	!= f1.end();
+				}			
+
+				if (bTOC)
+					_bContentWrite = true;
+
+				if ( bFORM )
+				{
+					std::wstring FORMTEXT		( L" FORMTEXT" );
+					std::wstring FORMCHECKBOX	( L" FORMCHECKBOX" );
+					std::wstring FORMDROPDOWN	( L" FORMDROPDOWN" );
+					
+					m_pXmlWriter->WriteNodeBegin( L"w:fldChar" , true );
+                    m_pXmlWriter->WriteAttribute( L"w:fldCharType" , L"begin" );
+                    m_pXmlWriter->WriteNodeEnd( L"", true, false );
+
+					bool bFORMTEXT		= search( f.begin(), f.end(), FORMTEXT.begin(),		FORMTEXT.end())	!= f.end();
+					bool bFORMCHECKBOX	= search( f.begin(), f.end(), FORMCHECKBOX.begin(),	FORMCHECKBOX.end())	!= f.end();
+					bool bFORMDROPDOWN	= search( f.begin(), f.end(), FORMDROPDOWN.begin(),	FORMDROPDOWN.end())	!= f.end();
+
+					if (bFORMTEXT || bFORMCHECKBOX || bFORMDROPDOWN)
+					{
+						int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
+						if (cpPic < cpFieldEnd)
+						{
+							int fcPic = m_document->FindFileCharPos( cpPic );
+							std::list<CharacterPropertyExceptions*>* chpxs	= m_document->GetCharacterPropertyExceptions(fcPic, fcPic + 1); 
+
+							if (chpxs)
+							{
+								CharacterPropertyExceptions* chpxSep = chpxs->front();
+								
+								FormFieldData ffdata (2, chpxSep, m_document->DataStream, false);
+								FormFieldDataMapping data_mapping(m_pXmlWriter, m_context, _caller);
+								ffdata.Convert(&data_mapping);
+								
+								RELEASEOBJECT( chpxs );
+							}
+						}
+					}
+
+                    m_pXmlWriter->WriteNodeEnd( L"w:fldChar" );
+
+					_fieldLevels.back().bBegin = true;
+				}
+				else if ( ( bMERGEFORMAT || bExcel || bWord || bOpendocument )
+						&& 
+						( ( bEMBED || bLINK ) && bChart) )
+				{
+                    m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
+                        m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
+                    m_pXmlWriter->WriteNodeEnd( L"", true, false );
+
+					int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
+
+                    m_pXmlWriter->WriteNodeEnd( L"w:fldChar" );
+
+					_fieldLevels.back().bBegin = true;
+				}
+				else if (bHYPERLINK && bPAGEREF)
+				{
+					int cpFieldSep2 = cpFieldStart, cpFieldSep1 = cpFieldStart;
+					std::vector<std::wstring> toc;
+
+					if (arField.size() > 1)
+						f = arField[1];
+
+					if ( _bContentWrite )
+					{
+						m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
+							m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
+						m_pXmlWriter->WriteNodeEnd( L"", true );
+
+						_fieldLevels.back().bBegin = true;
+					}
+					else
+					{
+						for (size_t i = 1; i < arField.size(); i++)
+						{
+							std::wstring f1 = arField[1];
+							int d = (int)f1.find(PAGEREF);
+
+							if (d > 0)
+							{
+								_writeWebHidden = true;
+								std::wstring _writeTocLink =f1.substr(d + 9);
+								d = (int)_writeTocLink.find(L" ");
+								_writeTocLink = _writeTocLink.substr(0, d);
+								
+								_writeAfterRun	=	std::wstring (L"<w:hyperlink w:anchor = \"");
+								_writeAfterRun +=	_writeTocLink;
+								_writeAfterRun +=	std::wstring (L"\" w:history=\"1\">");
+
+								break;								
+								//cp = cpFieldSep1;
+							}
+							//cpFieldSep1 = cpFieldSep2;
+						}
+						_skipRuns = 5; //with separator
+					}
+				}
+				//else if ( bHYPERLINK )
+				//{//todooo - выделение гиперссылки отдельно
+				//	std::vector<std::wstring> arRefs;
+				//	boost::algorithm::split(arRefs, f, boost::algorithm::is_any_of(L" "), boost::algorithm::token_compress_on);
+				//	
+				//	std::wstring sLink = arRefs[2];
+				//	m_pXmlWriter->WriteNodeBegin( L"w:hyperlink", true );
+
+				//	int relID = m_context->_docx->RegisterHyperlink(_caller, sLink);
+				//	m_pXmlWriter->WriteAttribute( L"r:id", L"rId"+ FormatUtils::IntToWideString( relID ) );
+				//	m_pXmlWriter->WriteAttribute( L"w:history", 1 );
+				//	m_pXmlWriter->WriteNodeEnd( L"", true, false );
+
+				//	if (arRefs.size() > 2)
+				//	{
+				//		writeTextElement(arRefs[3].substr(1, arRefs[3].length() - 2), textType);
+				//	}
+				//	m_pXmlWriter->WriteNodeEnd( L"w:hyperlink", false, true );
+
+				//	_skipRuns = 1;
+				//}
+				else if ( bEMBED ||	(bLINK && !bHYPERLINK)|| bQUOTE)						
+				{
+					int cpPic		=	searchNextTextMark(m_document->Text, cpFieldStart,	TextMark::Picture);
+					int cpFieldSep	=	searchNextTextMark(m_document->Text, cpFieldStart,	TextMark::FieldSeparator);
+
+					if (cpPic < cpFieldEnd)
+					{
+						int fcPic = m_document->FindFileCharPos( cpPic );
+						std::list<CharacterPropertyExceptions*>* chpxs	=	m_document->GetCharacterPropertyExceptions(fcPic, fcPic + 1); 
+						
+						CharacterPropertyExceptions* chpxObj =	chpxs->front();
+
+						RevisionData oData = RevisionData(chpxObj);
+
+						CharacterPropertiesMapping* rPr = new CharacterPropertiesMapping(m_pXmlWriter, m_document, &oData, _lastValidPapx, false);
+						if(rPr)
+						{
+							chpxObj->Convert(rPr);
+							RELEASEOBJECT(rPr);
+						}					
+						XMLTools::CStringXmlWriter	oleWriter;
+						XMLTools::CStringXmlWriter	oleObjectWriter;
+						
+						VMLPictureMapping	oVmlMapper (m_context, &oleWriter, true, _caller);
+
+						if (!m_shapeIdOwner.empty())		//4571833.doc
+							oVmlMapper.m_shapeId = m_shapeIdOwner;
+
+						if (m_document->nWordVersion > 0)
+						{							
+							OleObject ole ( chpxObj, m_document);
+							
+                            oleWriter.WriteNodeBegin (L"w:object", true);
+                                oleWriter.WriteAttribute( L"w:dxaOrig", FormatUtils::IntToWideString( ( ole.pictureDesciptor.dxaGoal + ole.pictureDesciptor.dxaOrigin ) ));
+                                oleWriter.WriteAttribute( L"w:dyaOrig", FormatUtils::IntToWideString( ( ole.pictureDesciptor.dyaGoal + ole.pictureDesciptor.dyaOrigin ) ));
+                            oleWriter.WriteNodeEnd( L"", true, false );
+
+							ole.pictureDesciptor.Convert(&oVmlMapper);
+							OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &ole.pictureDesciptor, _caller, oVmlMapper.m_shapeId);
+							
+							ole.Convert( &oleObjectMapping );
+
+							_lastOLEObject = oleObjectWriter.GetXmlString();
+						}
+						else
+						{
+							PictureDescriptor pic(chpxObj, m_document->DataStream, 0x7fffffff, m_document->nWordVersion);
+							
+                            oleWriter.WriteNodeBegin (L"w:object", true);
+                                oleWriter.WriteAttribute( L"w:dxaOrig", FormatUtils::IntToWideString( ( pic.dxaGoal + pic.dxaOrigin ) ) );
+                                oleWriter.WriteAttribute( L"w:dyaOrig", FormatUtils::IntToWideString( ( pic.dyaGoal + pic.dyaOrigin ) ) );
+                            oleWriter.WriteNodeEnd( L"", true, false );
+							
+							pic.Convert(&oVmlMapper);
+							RELEASEOBJECT(chpxs);
+
+							if ( cpFieldSep < cpFieldEnd  && m_document->m_PieceTable)
+							{
+								int fcFieldSep = m_document->m_PieceTable->FileCharacterPositions->operator []( cpFieldSep );
+								int fcFieldSep1 = m_document->FindFileCharPos( cpFieldSep );
+								
+								std::list<CharacterPropertyExceptions*>* chpxs = m_document->GetCharacterPropertyExceptions( fcFieldSep, ( fcFieldSep + 1 ) ); 
+								CharacterPropertyExceptions* chpxSep = chpxs->front();
+								
+								OleObject ole ( chpxSep, m_document);
+								OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &pic, _caller, oVmlMapper.m_shapeId );
+								
+								if (oVmlMapper.m_isEmbedded)
+								{
+									ole.isEquation		= oVmlMapper.m_isEquation;
+									ole.isEmbedded		= oVmlMapper.m_isEmbedded;
+									ole.emeddedData		= oVmlMapper.m_embeddedData;
+								}
+								ole.Convert( &oleObjectMapping );
+
+								_lastOLEObject = oleObjectWriter.GetXmlString();
+								
+								RELEASEOBJECT( chpxs );
+							}
+						}
+						oleWriter.WriteString( _lastOLEObject );
+                        oleWriter.WriteNodeEnd( L"w:object" );
+
+						if (!oVmlMapper.m_isEmbedded && oVmlMapper.m_isEquation)
+						{
+							//нельзя в Run писать oMath
+							//m_pXmlWriter->WriteString(oVmlMapper.m_equationXml);
+							_writeAfterRun = oVmlMapper.m_equationXml;
+						}
+						else
+						{
+							m_pXmlWriter->WriteString(oleWriter.GetXmlString());
+						}	
+					}
+
+					_skipRuns		= 3;
+					_embeddedObject	= true;
+				}					
+				else
+				{
+                    m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
+                        m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
+                    m_pXmlWriter->WriteNodeEnd( L"", true );
+
+					_fieldLevels.back().bBegin = true;
+				}
 			}
 			else if (TextMark::FieldSeparator == code)
 			{
@@ -917,7 +916,7 @@ namespace DocFileFormat
 					PictureDescriptor pictDiscr(chpx, m_document->WordDocumentStream, 0x7fffffff, m_document->nWordVersion);
 					ShapeContainer* pShape = m_document->GetOfficeArt()->GetShapeContainer(pSpa->GetShapeID());
 
-					if ((pShape) /*&& (false == pShape->isLastIdentify())*/)
+					if (pShape)
 					{
 						VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, pSpa, &pictDiscr,  _caller);
 						
@@ -951,59 +950,55 @@ namespace DocFileFormat
 					
                     m_pXmlWriter->WriteNodeEnd	 (L"w:pict");
 				}
-				else if ((oPicture.mfp.mm > 98) && (NULL != oPicture.shapeContainer)/* && (false == oPicture.shapeContainer->isLastIdentify())*/)
+				else if ((oPicture.mfp.mm > 98) && (NULL != oPicture.shapeContainer))
 				{
-					bool bPicture	= true;
-					bool m_bSkip	= false;
+					bool bFormula = false;
+
+					XMLTools::CStringXmlWriter pictWriter;
+                    pictWriter.WriteNodeBegin (L"w:pict");
+
+					bool picture = true;
 
 					if (oPicture.shapeContainer)
 					{
-						if (oPicture.shapeContainer->m_nShapeType != msosptPictureFrame)
-							bPicture = false;//шаблон 1.doc картинка в колонтитуле
+						int shape_type = oPicture.shapeContainer->getShapeType();
 
-						m_bSkip = oPicture.shapeContainer->m_bSkip;
+						if (shape_type != msosptPictureFrame) picture = false;//шаблон 1.doc картинка в колонтитуле
 					}
-					if (!m_bSkip)
+					
+					if (picture)
 					{
-						bool bFormula	= false;
-						XMLTools::CStringXmlWriter pictWriter;
-						pictWriter.WriteNodeBegin (L"w:pict");
-
-						if (bPicture)
-						{
-							VMLPictureMapping oVmlMapper(m_context, &pictWriter, false, _caller, isInline);
-							oPicture.Convert (&oVmlMapper);
-							
-							if (oVmlMapper.m_isEmbedded)
-							{
-								OleObject ole ( chpx, m_document);
-								OleObjectMapping oleObjectMapping( &pictWriter, m_context, &oPicture, _caller, oVmlMapper.m_shapeId );
-								
-								ole.isEquation		= oVmlMapper.m_isEquation;
-								ole.isEmbedded		= oVmlMapper.m_isEmbedded;
-								ole.emeddedData		= oVmlMapper.m_embeddedData;
-							
-								ole.Convert( &oleObjectMapping );
-							}
-							else if (oVmlMapper.m_isEquation)
-							{
-								//нельзя в Run писать oMath
-								//m_pXmlWriter->WriteString(oVmlMapper.m_equationXml);
-								_writeAfterRun = oVmlMapper.m_equationXml;
-								bFormula = true;
-							}
-						}
-						else
-						{
-							VMLShapeMapping oVmlMapper(m_context, &pictWriter, NULL, &oPicture,  _caller, isInline);
-							oPicture.shapeContainer->Convert(&oVmlMapper);
-						}
+						VMLPictureMapping oVmlMapper(m_context, &pictWriter, false, _caller, isInline);
+						oPicture.Convert (&oVmlMapper);
 						
-						pictWriter.WriteNodeEnd	 (L"w:pict");
-
-						if (!bFormula)
-							m_pXmlWriter->WriteString(pictWriter.GetXmlString());
+						if (oVmlMapper.m_isEmbedded)
+						{
+							OleObject ole ( chpx, m_document);
+							OleObjectMapping oleObjectMapping( &pictWriter, m_context, &oPicture, _caller, oVmlMapper.m_shapeId );
+							
+							ole.isEquation		= oVmlMapper.m_isEquation;
+							ole.isEmbedded		= oVmlMapper.m_isEmbedded;
+							ole.emeddedData		= oVmlMapper.m_embeddedData;
+						
+							ole.Convert( &oleObjectMapping );
+						}
+						else if (oVmlMapper.m_isEquation)
+						{
+							//нельзя в Run писать oMath
+							//m_pXmlWriter->WriteString(oVmlMapper.m_equationXml);
+							_writeAfterRun = oVmlMapper.m_equationXml;
+							bFormula = true;
+						}
+					}else
+					{
+						VMLShapeMapping oVmlMapper(m_context, &pictWriter, NULL, &oPicture,  _caller, isInline);
+						oPicture.shapeContainer->Convert(&oVmlMapper);
 					}
+					
+                    pictWriter.WriteNodeEnd	 (L"w:pict");
+
+					if (!bFormula)
+						m_pXmlWriter->WriteString(pictWriter.GetXmlString());
 
 				}                   
 			}
@@ -1012,11 +1007,6 @@ namespace DocFileFormat
 				if ((m_document->FootnoteReferenceCharactersPlex != NULL) && (m_document->FootnoteReferenceCharactersPlex->IsCpExists(cp)))
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:footnoteReference", true );
-					FootnoteDescriptor* desc = dynamic_cast<FootnoteDescriptor*>(m_document->FootnoteReferenceCharactersPlex->Elements[_footnoteNr]);
-					if (desc && desc->aFtnIdx == 0)
-					{
-						m_pXmlWriter->WriteAttribute( L"w:customMarkFollows", L"1");
-					}
                     m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString(_footnoteNr++ ) );
                     m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
@@ -1028,11 +1018,6 @@ namespace DocFileFormat
 				else if ((m_document->EndnoteReferenceCharactersPlex != NULL) && (m_document->EndnoteReferenceCharactersPlex->IsCpExists(cp)))
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:endnoteReference", true );
-					EndnoteDescriptor* desc = dynamic_cast<EndnoteDescriptor*>(m_document->EndnoteReferenceCharactersPlex->Elements[_endnoteNr]);
-					if (desc && desc->aEndIdx == 0)
-					{
-						m_pXmlWriter->WriteAttribute( L"w:customMarkFollows", L"1");
-					}
                     m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString(_endnoteNr++ ));
                     m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
@@ -1050,10 +1035,10 @@ namespace DocFileFormat
                     m_pXmlWriter->WriteNodeBegin( L"w:annotationRef", true );
                     m_pXmlWriter->WriteNodeEnd( L"", true );
 				}	
-				else if ((m_document->AnnotationsReferencePlex) && (_commentNr <= m_document->AnnotationsReferencePlex->Elements.size()))
+				else
 				{
 					m_pXmlWriter->WriteNodeBegin( L"w:commentReference", true );
-					m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr++ ));
+					m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr ));
 					m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
 			}
@@ -1064,21 +1049,7 @@ namespace DocFileFormat
 
 			cp++;
 		}
-		if (std::wstring::npos != text.find(L"EMBED"))
-		{//если есть мааркер конца поля и маркер замещающей картинки и нету маркера начала
-			//О реорганизации территориальных органов ПФР с 01.11.2018.doc
-			int cpFieldStart	= initialCp;
-			int cpPic			= searchNextTextMark(m_document->Text, cpFieldStart, TextMark::Picture);
-			int cpFieldEnd		= searchNextTextMark( m_document->Text, cpFieldStart, TextMark::FieldEndMark );
 
-			bool bStartField = _fieldLevels.empty() ? false : (_fieldLevels.back().bBegin && !_fieldLevels.back().bSeparate);
-
-			if (cpFieldStart < cpPic && cpPic < cpFieldEnd && !bStartField)
-			{
-				writeField(text, cpFieldStart, cpFieldEnd);
-				text.clear();
-			}
-		}
         if (!text.empty())
 		{
             //bool preserve_space = (text.find(L"\x20")) != text.npos) ? true : false;
@@ -1219,7 +1190,7 @@ namespace DocFileFormat
 
 		// add the parts
 
-		for (size_t i = 0; i < splitIndices->size(); ++i)
+		for (unsigned int i = 0; i < splitIndices->size(); ++i)
 		{
 			int cch = splitIndices->at( i ) - startIndex;
 
@@ -1348,8 +1319,6 @@ namespace DocFileFormat
 					{
 						iTap_current = FormatUtils::BytesToUInt32( iter->Arguments, 0, iter->argumentsSize );
 					}break;
-					default:
-						break;
 				}
 			}
 			if (nestingLevel == iTap_current)
@@ -1379,8 +1348,6 @@ namespace DocFileFormat
 
 							AddBoundary(boundary2, max_boundary, boundaries);
 						}break;
-						default:
-							break;
 					}
 				}
 			}

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -85,17 +85,21 @@ namespace DocFileFormat
 		int getCurrentSection	(int cp);
 //---------------------------------
 		bool isSectionEnd		( int cp );
-
+	// Writes a Paragraph that starts at the given cp and 
+	// ends at the next paragraph end mark or section end mark
 		int writeParagraph( int cp, int cpEnd ); 
+	// Writes a Paragraph that starts at the given cpStart and 
+	// ends at the given cpEnd
 		int writeParagraph( int initialCp, int cpEnd, bool sectionEnd, bool lastBad = false );
+	// Writes a Paragraph RSID
+		void writeParagraphRsid( const ParagraphPropertyExceptions* papx );
+	// Writes a run with the given characters and CHPX
 		int writeRun( std::vector<wchar_t>* chars, CharacterPropertyExceptions* chpx, int initialCp );
-		int	writeText			( std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText );
-		void writeParagraphRsid	( const ParagraphPropertyExceptions* papx );
+	// Writes the given text to the document	
+		int	 writeText			( std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText );
 		void writeTextElement	( const std::wstring& text, const std::wstring& textType );
         void writeTextStart		( const std::wstring& textType, bool preserve_space);
 		void writeTextEnd		( const std::wstring& textType );
-		void writeField			(const std::wstring& sFieldString, int cpFieldStart, int cpFieldEnd);
-
 		
 		std::vector<int> searchBookmarks( std::vector<wchar_t>* chars, int initialCp );
 		std::vector<int> searchAnnot(std::vector<wchar_t>* chars, int initialCp);

ASCOfficeDocFile/DocDocxConverter/EndnoteDescriptor.h

@@ -37,14 +37,21 @@ namespace DocFileFormat
 {
   class EndnoteDescriptor: public ByteStructure
   {
+    private:
+	  short aEndIdx;
+
     public:
       static const int STRUCTURE_SIZE = 2;
 
-	  EndnoteDescriptor(): aEndIdx(0) {}
+	  EndnoteDescriptor():
+      aEndIdx(0)
+	  {
+	  }
 
 	  virtual ~EndnoteDescriptor()
 	  {
-	  }  
+	  }
+  
       virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length )
       {
         EndnoteDescriptor *newObject = new EndnoteDescriptor();
@@ -53,7 +60,5 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>( newObject );
       }
-
-	  short aEndIdx;
   };
 }

ASCOfficeDocFile/DocDocxConverter/FileInformationBlock.h

@@ -110,7 +110,7 @@ namespace DocFileFormat
 	typedef struct FibWord2
 	{
 		unsigned int Spare  = 0;
-		unsigned short rgwSpare0[3];
+		unsigned char rgwSpare0[3];
 
 		unsigned int fcPlcMcr = 0;
 		unsigned int lcbPlcMcr = 0;
@@ -560,7 +560,8 @@ namespace DocFileFormat
 					m_FibWord97.fcPlcffndRef	= reader.ReadInt32();
 					m_FibWord97.lcbPlcffndRef	= reader.ReadInt32();	
 
-					m_FibWord97.fcPlcffndTxt	= reader.ReadInt32();//112
+					m_FibWord97.lcbPlcfandTxt	= reader.ReadInt32();//112
+
 					m_FibWord97.lcbPlcffndTxt	= reader.ReadInt32();
 
 					m_FibWord97.fcPlcfandRef	= reader.ReadInt32();
@@ -1312,10 +1313,10 @@ namespace DocFileFormat
 			
 			flag16 = reader.ReadUInt16(); //10
 			
-			m_FibBase.fDot				= ((flag16 & 0x0001) >> 2) != 0;
-			m_FibBase.fGlsy				= ((flag16 & 0x0002) >> 1) != 0;
-			m_FibBase.fComplex			= ((flag16 & 0x0004) >> 2) != 0;
-            m_FibBase.fHasPic			= ((flag16 & 0x0008) >> 3) != 0;
+			m_FibBase.fDot				= (flag16 & 0x0001) >> 2;
+			m_FibBase.fGlsy				= (flag16 & 0x0002) >> 1;
+			m_FibBase.fComplex			= (flag16 & 0x0004) >> 2;
+            m_FibBase.fHasPic			= (flag16 & 0x0008) >> 3;
             m_FibBase.cQuickSaves		= (WORD)(((int)flag16 & 0x00F0) >> 4);
             m_FibBase.fEncrypted		= FormatUtils::BitmaskToBool((int)flag16, 0x0100);
 			m_FibBase.fWhichTblStm		= FormatUtils::BitmaskToBool((int)flag16, 0x0200);

ASCOfficeDocFile/DocDocxConverter/FootnoteDescriptor.h

@@ -37,15 +37,21 @@ namespace DocFileFormat
 {
   class FootnoteDescriptor: public ByteStructure
   {
+    private:
+	  short aFtnIdx;
 
     public:
 	  static const int STRUCTURE_SIZE = 2;
 
-	  FootnoteDescriptor() : aFtnIdx(0)  {}
+	  FootnoteDescriptor():
+      aFtnIdx(0)
+	  {
+	  }
 
 	  virtual ~FootnoteDescriptor()
 	  {
-	  }  
+	  }
+  
       virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length )
       {
         FootnoteDescriptor *newObject = new FootnoteDescriptor();
@@ -54,7 +60,5 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>( newObject );
       }
-
-	  short aFtnIdx;
   };
 }

ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h

@@ -63,35 +63,7 @@ namespace DocFileFormat
                 m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
                 m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
                 m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
-				m_pXmlWriter->WriteAttribute( L"xmlns:wpc", L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" );
-				m_pXmlWriter->WriteAttribute( L"xmlns:mc", L"http://schemas.openxmlformats.org/markup-compatibility/2006");
-				m_pXmlWriter->WriteAttribute( L"xmlns:wp14", L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing");
-				m_pXmlWriter->WriteAttribute( L"xmlns:wp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
-				m_pXmlWriter->WriteAttribute( L"xmlns:w14", L"http://schemas.microsoft.com/office/word/2010/wordml" );
-				m_pXmlWriter->WriteAttribute( L"xmlns:wpg", L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" );
-				m_pXmlWriter->WriteAttribute( L"xmlns:wpi", L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk" );
-				m_pXmlWriter->WriteAttribute( L"xmlns:wne", L"http://schemas.microsoft.com/office/word/2006/wordml" );
-				m_pXmlWriter->WriteAttribute( L"xmlns:wps", L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape" );
-				m_pXmlWriter->WriteAttribute( L"xmlns:a", L"http://schemas.openxmlformats.org/drawingml/2006/main" );
-				m_pXmlWriter->WriteAttribute( L"xmlns:m", L"http://schemas.openxmlformats.org/officeDocument/2006/math" );
-				m_pXmlWriter->WriteAttribute( L"mc:Ignorable", L"w14 wp14" );
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
-                
-				//m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE );
-				//m_pXmlWriter->WriteAttribute( L"w:type", L"separator");
-				//m_pXmlWriter->WriteAttribute( L"w:id", L"-1");
-				//m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
-
-				//m_pXmlWriter->WriteString(L"<w:p><w:pPr><w:spacing w:lineRule=\"auto\" w:line=\"240\" w:after=\"0\"/></w:pPr><w:r></w:r><w:r><w:separator/></w:r></w:p>");
-				//m_pXmlWriter->WriteNodeEnd( L"w:footnote");
-
-				//m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE );
-				//m_pXmlWriter->WriteAttribute( L"w:type", L"continuationSeparator");
-				//m_pXmlWriter->WriteAttribute( L"w:id", L"0");
-				//m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
-
-				//m_pXmlWriter->WriteString(L"<w:p><w:pPr><w:spacing w:lineRule=\"auto\" w:line=\"240\" w:after=\"0\"/></w:pPr><w:r></w:r><w:r><w:continuationSeparator/></w:r></w:p>");
-				//m_pXmlWriter->WriteNodeEnd( L"w:footnote");
 
 				int cp = m_document->FIB->m_RgLw97.ccpText;
 

ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp

@@ -46,7 +46,7 @@ std::wstring readXstz(VirtualStreamReader *reader)
 
 	std::wstring ret;
 
-	if (cch > 0 && cch < 0x0fff)
+	if (cch > 0)
 	{
 		std::shared_ptr<unsigned char>data = std::shared_ptr<unsigned char>(reader->ReadBytes(cch * 2, true));	
 #if defined(_WIN32) || defined(_WIN64)
@@ -134,8 +134,6 @@ FormFieldData::FormFieldData( int type, const CharacterPropertyExceptions* chpx,
 				bNilPICFAndBinData = true; // or bPICFAndOfficeArtData - shape, pic, ole
 			}
 			break;
-			default:
-				break;
 		}
 	}
 

ASCOfficeDocFile/DocDocxConverter/ListData.cpp

@@ -32,8 +32,6 @@
 
 #include "ListData.h"
 
-#include <boost/make_shared.hpp>
-
 #include <algorithm> 
 #include <functional> 
 #include <cctype>
@@ -48,11 +46,6 @@ namespace DocFileFormat
 		RELEASEOBJECT(rglvl);
 	}
 
-	ListDataPtr ListData::create(VirtualStreamReader* reader, int length)
-	{
-		return boost::make_shared<ListData>(reader, length);
-	}
-
 	// Parses the StreamReader to retrieve a ListData
 
 	ListData::ListData(VirtualStreamReader* reader, int length) : rglvl(NULL)
@@ -87,85 +80,9 @@ namespace DocFileFormat
 
 		grfhic		= reader->ReadByte();
 	}
-	NumberingDescriptorPtr NumberingDescriptor::create(unsigned char * data, int length)
-	{
-		return boost::make_shared<NumberingDescriptor>(data, length);
-	}
-	bool NumberingDescriptor::operator == (const NumberingDescriptor & val) const
-	{
-		const bool res =     
-		nfc				== val.nfc &&
-		cbTextBefore	== val.cbTextBefore &&
-		cbTextAfter		== val.cbTextAfter &&
-		jc				== val.jc &&
-		fPrev			== val.fPrev &&
-		fHang			== val.fHang &&
-		fSetBold		== val.fSetBold &&
-		fSetItalic		== val.fSetItalic &&
-		fSetSmallCaps	== val.fSetSmallCaps &&
-		fSetCaps		== val.fSetCaps &&
-		fSetStrike		== val.fSetStrike &&
-		fSetKul			== val.fSetKul &&
-		fPrevSpace		== val.fPrevSpace &&
-		fBold			== val.fBold &&
-		fItalic			== val.fItalic &&
-		fSmallCaps		== val.fSmallCaps &&
-		fCaps			== val.fCaps &&
-		fStrike			== val.fStrike &&
-		kul				== val.kul &&
-		ico				== val.ico &&
-		ftc				== val.ftc &&
-		hps				== val.hps &&
-		iStartAt		== val.iStartAt &&
-		dxaIndent		== val.dxaIndent &&
-		dxaSpace		== val.dxaSpace &&
-		fNumber1		== val.fNumber1 &&
-		fNumberAcross	== val.fNumberAcross &&
-		fRestartHdn		== val.fRestartHdn &&
-		fSpareX			== val.fSpareX;
 
-		return res;
-	}
-	bool NumberingDescriptor::operator == (const NumberingDescriptorPtr & val) const
-	{
-		if (!val) return false;
-		const bool res =     
-		nfc				== val->nfc &&
-		cbTextBefore	== val->cbTextBefore &&
-		cbTextAfter		== val->cbTextAfter &&
-		jc				== val->jc &&
-		fPrev			== val->fPrev &&
-		fHang			== val->fHang &&
-		fSetBold		== val->fSetBold &&
-		fSetItalic		== val->fSetItalic &&
-		fSetSmallCaps	== val->fSetSmallCaps &&
-		fSetCaps		== val->fSetCaps &&
-		fSetStrike		== val->fSetStrike &&
-		fSetKul			== val->fSetKul &&
-		fPrevSpace		== val->fPrevSpace &&
-		fBold			== val->fBold &&
-		fItalic			== val->fItalic &&
-		fSmallCaps		== val->fSmallCaps &&
-		fCaps			== val->fCaps &&
-		fStrike			== val->fStrike &&
-		kul				== val->kul &&
-		ico				== val->ico &&
-		ftc				== val->ftc &&
-		hps				== val->hps &&
-		iStartAt		== val->iStartAt &&
-		dxaIndent		== val->dxaIndent &&
-		dxaSpace		== val->dxaSpace &&
-		fNumber1		== val->fNumber1 &&
-		fNumberAcross	== val->fNumberAcross &&
-		fRestartHdn		== val->fRestartHdn &&
-		fSpareX			== val->fSpareX;
-
-		return res;
-
-	}
 	NumberingDescriptor::NumberingDescriptor( unsigned char * data, int length )
 	{
-		id				= 0;
 		nfc				= FormatUtils::BytesToUChar(data, 0, length);
 		cbTextBefore	= FormatUtils::BytesToUChar(data, 1, length);
 		cbTextAfter		= FormatUtils::BytesToUChar(data, 2, length);

ASCOfficeDocFile/DocDocxConverter/ListData.h

@@ -36,9 +36,6 @@
 
 namespace DocFileFormat
 {
-	class ListData;
-	typedef class boost::shared_ptr<ListData> ListDataPtr;
-
 	class ListData
 	{
 		friend class ListTable;
@@ -77,20 +74,15 @@ namespace DocFileFormat
 
 		virtual ~ListData();
 		ListData( VirtualStreamReader* reader, int length );
-
-		static ListDataPtr create(VirtualStreamReader* reader, int length);
 	};
 
-	class NumberingDescriptor;
-	typedef class boost::shared_ptr<NumberingDescriptor> NumberingDescriptorPtr;
-	
 	class NumberingDescriptor : public IVisitable
 	{
 		friend class ListTable;
 		friend class NumberingMapping;
 	
 	private:
-		size_t			id;
+
 		unsigned char	nfc;
 		unsigned char	cbTextBefore;
 		unsigned char	cbTextAfter;
@@ -129,15 +121,9 @@ namespace DocFileFormat
 		std::wstring	xst; //32 chars ansi
 
 	public:
-
-		bool operator == (const NumberingDescriptor & val) const;
-		bool operator == (const NumberingDescriptorPtr & val) const;
-
 		virtual ~NumberingDescriptor(){}
 		// Parses the given StreamReader to retrieve a ANLD struct
 		NumberingDescriptor( unsigned char * data, int length ); //cbANLD (count of bytes of ANLD) is 52 
-		
-		static NumberingDescriptorPtr create(unsigned char * data, int length);
 	};
 
 	

ASCOfficeDocFile/DocDocxConverter/ListTable.cpp

@@ -38,6 +38,7 @@ namespace DocFileFormat
 {
 	ListTable::~ListTable()
 	{
+		for_each( this->listData.begin(), this->listData.end(), DeleteDynamicObject() );
 	}
 
 	ListTable::ListTable( FileInformationBlock* fib, POLE::Stream* tableStream )
@@ -58,32 +59,23 @@ namespace DocFileFormat
 			//read the LSTF structs
 			for ( int i = 0; i < count; i++ )
 			{
-				listData.push_back( ListData::create( &reader, ListData::VARIABLE_LENGTH ) );
+				listData.push_back( new ListData( &reader, ListData::VARIABLE_LENGTH ) );
 			}
 
 			//read the LVLF structs
-			for ( size_t i = 0; i < listData.size(); ++i)
+			for ( std::list<ListData*>::iterator iter = listData.begin(); iter != listData.end(); iter++ )
 			{
-				for ( size_t j = 0; j < listData[i]->rglvl->size(); j++ )
+				for ( unsigned int j = 0; j < (*iter)->rglvl->size(); j++ )
 				{
-					listData[i]->rglvl->operator []( j ) = new ListLevel( &reader, ListData::VARIABLE_LENGTH );
+					(*iter)->rglvl->operator []( j ) = new ListLevel( &reader, ListData::VARIABLE_LENGTH );
 				}
 			}
 		}
 	}
 
-	size_t ListTable::appendNumbering( NumberingDescriptorPtr &desc )
+	void ListTable::appendNumbering( const NumberingDescriptor & desc )
 	{
-		for (size_t i = 0; i < listNumbering.size(); ++i)
-		{
-			if (listNumbering[i]->operator==(desc))
-			{
-				return listNumbering[i]->id;
-			}
-		}
-		desc->id = listData.size() + listNumbering.size()/* + 1*/;
 		listNumbering.push_back(desc);
-		return desc->id;
 	}
 
 }

ASCOfficeDocFile/DocDocxConverter/ListTable.h

@@ -41,12 +41,12 @@ namespace DocFileFormat
   class ListTable: public IVisitable
   {
     public: 
-		std::vector<ListDataPtr>			listData;
-		std::vector<NumberingDescriptorPtr>	listNumbering;
+		std::list<ListData*>			listData;
+		std::list<NumberingDescriptor>	listNumbering;
 
 		virtual ~ListTable();
 		ListTable( FileInformationBlock* fib, POLE::Stream* tableStream );
 
-		size_t appendNumbering( NumberingDescriptorPtr &desc );
+		void appendNumbering( const NumberingDescriptor & desc );
   };
 }

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp

@@ -31,7 +31,6 @@
  */
 
 #include "MainDocumentMapping.h"
-#include "OfficeDrawing/FillStyleBooleanProperties.h"
 
 namespace DocFileFormat
 {
@@ -60,51 +59,35 @@ namespace DocFileFormat
 		m_pXmlWriter->WriteAttribute(L"xmlns:w",		OpenXmlNamespaces::WordprocessingML );
 		m_pXmlWriter->WriteAttribute(L"xmlns:v",		OpenXmlNamespaces::VectorML );
 		m_pXmlWriter->WriteAttribute(L"xmlns:o",		OpenXmlNamespaces::Office );
-		m_pXmlWriter->WriteAttribute(L"xmlns:r",		OpenXmlNamespaces::Relationships );
 		m_pXmlWriter->WriteAttribute(L"xmlns:w10",		OpenXmlNamespaces::OfficeWord );
+		m_pXmlWriter->WriteAttribute(L"xmlns:r",		OpenXmlNamespaces::Relationships );
 		m_pXmlWriter->WriteAttribute(L"xmlns:m",		L"http://schemas.openxmlformats.org/officeDocument/2006/math");
 
-		m_pXmlWriter->WriteAttribute(L"xmlns:wpc",		L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas");
-		m_pXmlWriter->WriteAttribute(L"xmlns:cx",		L"http://schemas.microsoft.com/office/drawing/2014/chartex");
-		m_pXmlWriter->WriteAttribute(L"xmlns:cx1",		L"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex");
-		m_pXmlWriter->WriteAttribute(L"xmlns:mc",		L"http://schemas.openxmlformats.org/markup-compatibility/2006"); 
-		m_pXmlWriter->WriteAttribute(L"xmlns:wp14",		L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing");
-		m_pXmlWriter->WriteAttribute(L"xmlns:wp",		L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
-		m_pXmlWriter->WriteAttribute(L"xmlns:w14",		L"http://schemas.microsoft.com/office/word/2010/wordml");
-		m_pXmlWriter->WriteAttribute(L"xmlns:w15",		L"http://schemas.microsoft.com/office/word/2012/wordml");
-		m_pXmlWriter->WriteAttribute(L"xmlns:w16se",	L"http://schemas.microsoft.com/office/word/2015/wordml/symex");
-		m_pXmlWriter->WriteAttribute(L"xmlns:wpg",		L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup");
-		m_pXmlWriter->WriteAttribute(L"xmlns:wpi",		L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk");
-		m_pXmlWriter->WriteAttribute(L"xmlns:wne",		L"http://schemas.microsoft.com/office/word/2006/wordml");
-		m_pXmlWriter->WriteAttribute(L"xmlns:wps",		L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape");
-		m_pXmlWriter->WriteAttribute(L"mc:Ignorable",	L"w14 w15 w16se wp14");
-	
-
-		  m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wpc",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:mc",		L"http://schemas.openxmlformats.org/markup-compatibility/2006"); 
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wp14",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wp",		L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:w14",	L"http://schemas.microsoft.com/office/word/2010/wordml");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wpg",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wpi",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wne",	L"http://schemas.microsoft.com/office/word/2006/wordml");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wps",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape");
+		//m_pXmlWriter->WriteAttribute(L"mc:Ignorable", L"w14 wp14");
+		
+		m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 		if ((m_document->GetOfficeArt()) && (m_document->GetOfficeArt()->GetShapeBackgound()))
 		{
-			bool bFilled = true;
 			m_document->DocProperties->bDisplayBackgroundShape = true;
 			ShapeContainer* pShape = m_document->GetOfficeArt()->GetShapeBackgound();
 
-			OptionEntryPtr boolFill = pShape->ExtractOption(fillStyleBooleanProperties);
-
-			FillStyleBooleanProperties booleans(boolFill ? boolFill->op : 0);
-			if (booleans.fUsefFilled && !booleans.fFilled)
-			{
-				bFilled = false;
-			}
-			if (bFilled)
-			{
-				m_pXmlWriter->WriteNodeBegin ( L"w:background", TRUE);
-					m_pXmlWriter->WriteAttribute ( L"w:color", L"FFFFFF");
-				m_pXmlWriter->WriteNodeEnd( L"",  TRUE, FALSE );
-				
-				VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, NULL,  _caller);
-					pShape->Convert(&oVmlWriter);
-				m_pXmlWriter->WriteNodeEnd (L"w:background");
-			}
+			m_pXmlWriter->WriteNodeBegin ( L"w:background", TRUE);
+				m_pXmlWriter->WriteAttribute	( L"w:color", L"FFFFFF");
+			m_pXmlWriter->WriteNodeEnd( L"",  TRUE, FALSE );
+			
+			VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, NULL,  _caller);
+				pShape->Convert(&oVmlWriter);
+			m_pXmlWriter->WriteNodeEnd (L"w:background");
 		}
 
 		m_pXmlWriter->WriteNodeBegin( L"w:body", FALSE );

ASCOfficeDocFile/DocDocxConverter/MemoryStream.h

@@ -78,14 +78,7 @@ public:
 
 		return rdUShort;
 	}
-	void WriteUInt16(unsigned short val)
-	{
-		if (m_Data)
-		{
-			((unsigned short *)(m_Data + m_Position))[0] = val;
-			m_Position	+=	sizeof(unsigned short);
-		}
-	}
+
 	virtual short ReadInt16()
 	{
 		short rdShort = 0;
@@ -111,14 +104,7 @@ public:
 
 		return rdInt;
 	}
-	void WriteInt32(_INT32 val)
-	{
-		if (m_Data)
-		{
-			((_INT32 *)(m_Data + m_Position))[0] = val;
-			m_Position	+=	sizeof(_INT32);
-		}
-	}
+
 	virtual unsigned int ReadUInt32()
 	{
 		int rdUInt = 0;
@@ -131,22 +117,7 @@ public:
 
 		return rdUInt;
 	}
-	void WriteByte(unsigned char val)
-	{
-		if (m_Data)
-		{
-			m_Data[m_Position] = val;
-			m_Position	+= 1;
-		}
-	}
-	void WriteUInt32(_UINT32 val)
-	{
-		if (m_Data)
-		{
-			((_UINT32 *)(m_Data + m_Position))[0] = val;
-			m_Position	+=	sizeof(_UINT32);
-		}
-	}
+
 	virtual unsigned char ReadByte()
 	{
 		unsigned char rdByte = 0;
@@ -188,14 +159,6 @@ public:
 
 		return pBytes;
 	}
-	void WriteBytes(unsigned char* pData, int size)
-	{
-		if (m_Data)
-		{
-			memcpy(m_Data + m_Position, pData, size);
-			m_Position += size;
-		}
-	}
 
 	virtual unsigned long GetPosition() const
 	{
@@ -209,7 +172,7 @@ public:
 
     virtual int Seek (int offset, int origin = 0/*STREAM_SEEK_SET*/)
 	{
-		if ( (m_Data != NULL) && (offset >= 0) && ((unsigned int)offset < m_Size) )
+		if ( (m_Data != NULL) && (offset > 0) && ((unsigned int)offset < m_Size) )
 			return m_Position = offset;
 
 		return 0;

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -72,42 +72,33 @@ namespace DocFileFormat
             m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
             m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
             m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
-			m_pXmlWriter->WriteAttribute( L"xmlns:wpc", L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" );
-			m_pXmlWriter->WriteAttribute( L"xmlns:mc", L"http://schemas.openxmlformats.org/markup-compatibility/2006");
-			m_pXmlWriter->WriteAttribute( L"xmlns:wp14", L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing");
-			m_pXmlWriter->WriteAttribute( L"xmlns:wp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
-			m_pXmlWriter->WriteAttribute( L"xmlns:w14", L"http://schemas.microsoft.com/office/word/2010/wordml" );
-			m_pXmlWriter->WriteAttribute( L"xmlns:wpg", L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" );
-			m_pXmlWriter->WriteAttribute( L"xmlns:wpi", L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk" );
-			m_pXmlWriter->WriteAttribute( L"xmlns:wne", L"http://schemas.microsoft.com/office/word/2006/wordml" );
-			m_pXmlWriter->WriteAttribute( L"xmlns:wps", L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape" );
-			m_pXmlWriter->WriteAttribute( L"xmlns:a", L"http://schemas.openxmlformats.org/drawingml/2006/main" );
-			m_pXmlWriter->WriteAttribute( L"xmlns:m", L"http://schemas.openxmlformats.org/officeDocument/2006/math" );
-			m_pXmlWriter->WriteAttribute( L"mc:Ignorable", L"w14 wp14" );
+
             m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 			PictureBulletsMapping();
 
-			for (size_t i = 0; i < rglst->listData.size();  ++i)
+			int i = 0;
+
+			for (std::list<ListData*>::iterator iter = rglst->listData.begin(); iter != rglst->listData.end(); ++iter, ++i)
 			{
 				//start abstractNum
                 m_pXmlWriter->WriteNodeBegin( L"w:abstractNum", TRUE );
-                m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::IntToWideString( i /*+ 1 */));
+                m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::IntToWideString( i ));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				//nsid
                 m_pXmlWriter->WriteNodeBegin( L"w:nsid", TRUE );
-                m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( rglst->listData[i]->lsid, L"%08x" ));
+                m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( (*iter)->lsid, L"%08x" ));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				//multiLevelType
                 m_pXmlWriter->WriteNodeBegin( L"w:multiLevelType", TRUE );
 
-				if ( rglst->listData[i]->fHybrid )
+				if ( (*iter)->fHybrid )
 				{
                     m_pXmlWriter->WriteAttribute( L"w:val", L"hybridMultilevel" );
 				}
-				else if ( rglst->listData[i]->fSimpleList )
+				else if ( (*iter)->fSimpleList )
 				{
                     m_pXmlWriter->WriteAttribute( L"w:val", L"singleLevel" );
 				}
@@ -120,32 +111,32 @@ namespace DocFileFormat
 
 				//template
                 m_pXmlWriter->WriteNodeBegin( L"w:tmpl", TRUE );
-                m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( rglst->listData[i]->tplc, L"%08x"));
+                m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( (*iter)->tplc, L"%08x"));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				// writes the levels
-				size_t length = rglst->listData[i]->rglvl->size();
+				size_t length = (*iter)->rglvl->size();
 
 				for (size_t j = 0; j < length; ++j)
 				{
-					ListLevel* lvl = rglst->listData[i]->rglvl->at(j);
-					LevelMapping(lvl, j, rglst->listData[i]->rgistd[j]);
+					ListLevel* lvl = (*iter)->rglvl->at(j);
+					LevelMapping(lvl, j, (*iter)->rgistd[j]);
 				}
 
 				//end abstractNum
                 m_pXmlWriter->WriteNodeEnd( L"w:abstractNum" );
 			}
 			//write old style numbering (сложносоставных не сущестует)
-			for (size_t i = 0;  i < rglst->listNumbering.size();  ++i)
+			for (std::list<NumberingDescriptor>::iterator iter = rglst->listNumbering.begin(); iter != rglst->listNumbering.end(); ++iter, ++i)
 			{
 				//start abstractNum
                 m_pXmlWriter->WriteNodeBegin( L"w:abstractNum", TRUE );
-                m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::IntToWideString( rglst->listNumbering[i]->id ));
+                m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::IntToWideString( i ));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				////nsid
                 //m_pXmlWriter->WriteNodeBegin( L"w:nsid", TRUE );
-                //m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( rglst->listNumbering[i]->lsid, L"%08x" ) ));
+                //m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( (*iter)->lsid, L"%08x" ) ));
                 //m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				//multiLevelType
@@ -156,14 +147,14 @@ namespace DocFileFormat
 
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
-				LevelMapping(rglst->listNumbering[i], 0);
+				LevelMapping(*iter, 0);
 
 				//end abstractNum
                 m_pXmlWriter->WriteNodeEnd( L"w:abstractNum" );
 			}
 
 			//write the overrides
-			for (size_t i = 0; i < m_document->listFormatOverrideTable->size(); ++i)
+			for (unsigned int i = 0; i < m_document->listFormatOverrideTable->size(); ++i)
 			{
 				ListFormatOverride* lfo = m_document->listFormatOverrideTable->at(i);
 
@@ -202,15 +193,16 @@ namespace DocFileFormat
 
 			if (m_document->listFormatOverrideTable->empty() &&  !rglst->listNumbering.empty())
 			{
-				for (size_t i = 0; i < rglst->listNumbering.size(); ++i)
+				i = 0;
+				for (std::list<NumberingDescriptor>::iterator iter = rglst->listNumbering.begin(); iter != rglst->listNumbering.end(); ++iter, ++i)
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:num", TRUE );
-                    m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::IntToWideString(rglst->listNumbering[i]->id));
+                    m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::IntToWideString(i+1));
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 
                     m_pXmlWriter->WriteNodeBegin( L"w:abstractNumId", TRUE );
-                    m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString( rglst->listNumbering[i]->id ));
+                    m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString( i ));
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
                     m_pXmlWriter->WriteNodeEnd(L"w:num");
@@ -223,20 +215,21 @@ namespace DocFileFormat
 		}
 	}
 
-	int NumberingMapping::FindIndexbyId(std::vector<ListDataPtr>& listData, int lsid)
+	int NumberingMapping::FindIndexbyId(const std::list<ListData*>& listData, int id)
 	{
 		int ret = -1;
 		int i = 0;
 
-		for (size_t i = 0; i < listData.size(); ++i)
+		for (std::list<ListData*>::const_iterator iter = listData.begin(); iter != listData.end(); ++iter, ++i)
 		{
-			if (listData[i]->lsid == lsid)
+			if ((*iter)->lsid == id)
 			{
-				return i;
+				ret = i;
+				break;
 			}
 		}
 
-		return -1;
+		return ret;
 	}
 
 	// Converts the number text of the binary format to the number text of OOXML.
@@ -295,17 +288,15 @@ namespace DocFileFormat
 		return ret;
 	}
 	
-	std::wstring NumberingMapping::GetLvlText(NumberingDescriptorPtr& lvl, bool bIsSymbol, int Before, int After) const
+	std::wstring NumberingMapping::GetLvlText(const NumberingDescriptor& lvl, bool bIsSymbol, int Before, int After) const
 	{
-		if (!lvl)return L"";
-
 		std::wstring ret;
 
-		if (lvl->nfc == 0xff)
+		if (lvl.nfc == 0xff)
 		{
-			if (!lvl->xst.empty())
+			if (!lvl.xst.empty())
 			{
-				wchar_t xchBullet = lvl->xst[0];
+				wchar_t xchBullet = lvl.xst[0];
 
 				// В символьном шрифте обрезать надо, в других случаях - нет
 				if (bIsSymbol && (xchBullet & 0xF000) != 0)
@@ -315,7 +306,7 @@ namespace DocFileFormat
 
 				if (!FormatUtils::IsControlSymbol(xchBullet))
 				{
-					ret.push_back(lvl->xst[0]);
+					ret.push_back(lvl.xst[0]);
 				}
 			}
 			else
@@ -325,8 +316,8 @@ namespace DocFileFormat
 		}
 		else
 		{
-			std::wstring strBefore		=	lvl->xst.substr(0, Before);
-			std::wstring strAfter		=	lvl->xst.substr(Before, After);
+			std::wstring strBefore		=	lvl.xst.substr(0, Before);
+			std::wstring strAfter		=	lvl.xst.substr(Before, After);
 
             ret = strBefore + L"%1" + strAfter ;
 		}
@@ -482,16 +473,14 @@ namespace DocFileFormat
 		}
 	}
 
-	void NumberingMapping::LevelMapping(NumberingDescriptorPtr & lvl, unsigned int level)
+	void NumberingMapping::LevelMapping(const NumberingDescriptor& lvl, unsigned int level)
 	{
-		if (!lvl) return;
-
 		std::wstring fontFamily;
 		bool isSymbol = false;
 		
-		if( lvl->ftc < m_document->FontTable->Data.size() )
+		if( lvl.ftc < m_document->FontTable->Data.size() )
 		{
-			FontFamilyName* ffn = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( lvl->ftc ) );
+			FontFamilyName* ffn = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( lvl.ftc ) );
 			isSymbol = (ffn->chs == 2);
 			fontFamily = FormatUtils::XmlEncode(ffn->xszFtn);
 		}
@@ -502,22 +491,22 @@ namespace DocFileFormat
         m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
         m_pXmlWriter->WriteNodeBegin( L"w:start", TRUE );
-            m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString(lvl->iStartAt));
+            m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString(lvl.iStartAt));
         m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
         m_pXmlWriter->WriteNodeBegin( L"w:numFmt", TRUE );
-            m_pXmlWriter->WriteAttribute( L"w:val", GetNumberFormatWideString(lvl->nfc, true));
+            m_pXmlWriter->WriteAttribute( L"w:val", GetNumberFormatWideString(lvl.nfc, true));
         m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 //// suffix
 //		m_pXmlWriter->WriteNodeBegin( L"w:suff", TRUE );
-//		m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl->ixchFollow, &FollowingCharMap[0][0], 3, 8));
+//		m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl.ixchFollow, &FollowingCharMap[0][0], 3, 8));
 //		m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 // Number level text
-		std::wstring lvlText = GetLvlText(lvl, isSymbol, lvl->cbTextBefore, lvl->cbTextAfter);
+		std::wstring lvlText = GetLvlText(lvl, isSymbol, lvl.cbTextBefore, lvl.cbTextAfter);
 
-		//if (lvlText.empty() && lvl->ftc == 0)//auto
+		//if (lvlText.empty() && lvl.ftc == 0)//auto
 		//{
 		//	lvlText.push_back(L'\xF0B7');
 		//	lvlText.push_back(L'\0');
@@ -533,7 +522,7 @@ namespace DocFileFormat
 
 // jc
         m_pXmlWriter->WriteNodeBegin( L"w:lvlJc", TRUE );
-            m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl->jc, &LevelJustificationMap[0][0], 3, 7));
+            m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl.jc, &LevelJustificationMap[0][0], 3, 7));
         m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 // pPr
         m_pXmlWriter->WriteNodeBegin( L"w:pPr", FALSE );
@@ -697,8 +686,6 @@ namespace DocFileFormat
 					{
 						isPictureBullet = FormatUtils::BitmaskToBool(FormatUtils::BytesToUInt16(iter->Arguments, 0, iter->argumentsSize), 0x1);  
 					}break;
-					default:
-						break;
 				}
 			}
 

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h

@@ -63,7 +63,7 @@ namespace DocFileFormat
 		NumberingMapping(ConversionContext* ctx);
 		void Apply(IVisitable* visited);
 		
-		static int FindIndexbyId(std::vector<ListDataPtr>& listData, int id);
+		static int FindIndexbyId(const std::list<ListData*>& listData, int id);
 		/// Converts the number format code of the binary format.
 		static std::wstring GetNumberFormatWideString(int nfc, int nWordVersion = 0);
 		
@@ -73,12 +73,12 @@ namespace DocFileFormat
 		// Converts the number text of the binary format to the number text of OOXML.
 		// OOXML uses different placeholders for the numbers.
 		std::wstring GetLvlText(const ListLevel* lvl, bool bIsSymbol) const;
-		std::wstring GetLvlText(NumberingDescriptorPtr& lvl, bool bIsSymbol, int Before, int After) const;
+		std::wstring GetLvlText(const NumberingDescriptor& lvl, bool bIsSymbol, int Before, int After) const;
 		
 		static bool IsPlaceholder(wchar_t symbol);
 		
 		void LevelMapping(const ListLevel* lvl, unsigned int level, short styleIndex);
-		void LevelMapping(NumberingDescriptorPtr & lvl, unsigned int level);
+		void LevelMapping(const NumberingDescriptor& lvl, unsigned int level);
 
 		void PictureBulletsMapping();
 		void WriteLevelPictureBullet(const CharacterPropertyExceptions* grpprlChpx);

ASCOfficeDocFile/DocDocxConverter/OfficeArtContent.h

@@ -58,7 +58,7 @@ namespace DocFileFormat
 
 	public:
 
-		OfficeArtContent (const FileInformationBlock* pFIB, POLE::Stream* pStream): m_pDrawingGroupData(NULL), m_pBackgroud(NULL), m_uLastShapeId(1024)
+		OfficeArtContent (const FileInformationBlock* pFIB, POLE::Stream* pStream): m_pDrawingGroupData(NULL), m_pBackgroud(NULL)
 		{
 			VirtualStreamReader oStearmReader(pStream, 0 , pFIB->m_nWordVersion);
 
@@ -79,13 +79,14 @@ namespace DocFileFormat
 					drawing.dgglbl			=	(DrawingType)oStearmReader.ReadByte();
 					drawing.container		=	static_cast<DrawingContainer*>(RecordFactory::ReadRecord (&oStearmReader, 0));
 
-					for (size_t i = 0; i < drawing.container->Children.size(); ++i)
+					for (unsigned int i = 0; i < drawing.container->Children.size(); ++i)
 					{
 						Record* groupChild = drawing.container->Children[i];
 						if (groupChild)
 						{
 							if (GroupContainer::TYPE_CODE_0xF003 == groupChild->TypeCode)
 							{
+								// the child is a subgroup
 								GroupContainer* group	=	static_cast<GroupContainer*>(groupChild);
 								if (group)
 								{
@@ -94,24 +95,17 @@ namespace DocFileFormat
 							}
 							else if (ShapeContainer::TYPE_CODE_0xF004 == groupChild->TypeCode)
 							{
+								// the child is a shape
 								ShapeContainer* shape	=	static_cast<ShapeContainer*>(groupChild);
 								if (shape)
 								{
-									shape->m_nIndex = (int)i;
-									if (shape->m_bBackground)
+									shape->Index = i;
+									if (shape->isBackground())
 									{
 										m_pBackgroud = shape;
 									}
 								}
 							}
-							else if (DrawingRecord::TYPE_CODE_0xF008 == groupChild->TypeCode)
-							{
-								DrawingRecord* dr	=	static_cast<DrawingRecord*>(groupChild);
-								if (dr)
-								{
-									m_uLastShapeId = dr->spidCur;
-								}
-							}
 						}
 					}
 
@@ -140,7 +134,7 @@ namespace DocFileFormat
 				GroupContainer* group = iter->container->FirstChildWithType<GroupContainer>();
 				if (group)
 				{
-					for (size_t i = 1; i < group->Children.size(); ++i)
+					for (unsigned int i = 1; i < group->Children.size(); ++i)
 					{
 						Record* groupChild = group->Children[i];
 
@@ -189,7 +183,7 @@ namespace DocFileFormat
 		{
 			return m_pDrawingGroupData;
 		}
-		unsigned int					m_uLastShapeId;
+
 	private:
 		ShapeContainer*					m_pBackgroud;
 		DrawingGroup*					m_pDrawingGroupData;

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientAnchor.h

@@ -40,13 +40,13 @@ namespace DocFileFormat
 	public:
 		static const unsigned short TYPE_CODE_0xF010 = 0xF010;
 
-		ClientAnchor() : Record(), value(0)
+		ClientAnchor() : Record(), clientanchor(0)
 		{
 		}
 
-		ClientAnchor (IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance) : Record (_reader, size, typeCode, version, instance), value(0)
+		ClientAnchor (IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance) : Record (_reader, size, typeCode, version, instance), clientanchor(0)
 		{
-			value	=	Reader->ReadInt32(); //index PlcfSpa
+			clientanchor	=	Reader->ReadInt32();
 		}
 
 		virtual ~ClientAnchor()
@@ -58,6 +58,8 @@ namespace DocFileFormat
 			return new ClientAnchor (_reader, bodySize, typeCode, version, instance);
 		}
 
-		unsigned int value;
+	private:
+
+		int	clientanchor;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingRecord.h

@@ -38,30 +38,30 @@ namespace DocFileFormat
   class DrawingRecord: public Record
   {
     public:
-		static const unsigned short TYPE_CODE_0xF008 = 0xF008;
+      static const unsigned short TYPE_CODE_0xF008 = 0xF008;
      
-		unsigned int	csp;		// The number of shapes in this drawing
-		unsigned int	spidCur;	// The last MSOSPID given to an SP in this DG
+	  unsigned int	csp;		// The number of shapes in this drawing
+      int			spidCur;	// The last MSOSPID given to an SP in this DG
 
-		DrawingRecord():
-		Record(), csp(0), spidCur(0)
-		{
-		}
+	  DrawingRecord():
+	  Record(), csp(0), spidCur(0)
+	  {
+	  }
 
-		DrawingRecord( IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance ):
-		Record( _reader, size, typeCode, version, instance )
-		{
+	  DrawingRecord( IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance ):
+      Record( _reader, size, typeCode, version, instance )
+      {
 			csp		= Reader->ReadUInt32();
 			spidCur	= Reader->ReadInt32();
-		}
+      }
 
-		virtual ~DrawingRecord()
-		{
-		}
+	  virtual ~DrawingRecord()
+	  {
+	  }
 
-		virtual Record* NewObject( IBinaryReader* _reader, unsigned int bodySize, unsigned int typeCode, unsigned int version, unsigned int instance )
-		{
-			return new DrawingRecord( _reader, bodySize, typeCode, version, instance );
-		}
+	  virtual Record* NewObject( IBinaryReader* _reader, unsigned int bodySize, unsigned int typeCode, unsigned int version, unsigned int instance )
+	  {
+	    return new DrawingRecord( _reader, bodySize, typeCode, version, instance );
+	  }
   };
 }

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/GroupContainer.h

@@ -65,7 +65,7 @@ namespace DocFileFormat
 					{
 						// the child is a shape
 						ShapeContainer* shape = static_cast<ShapeContainer*>(groupChild);
-						shape->m_nIndex = i;
+						shape->Index = i;
 						this->Children[i] = shape;
 					}
 				}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h

@@ -112,7 +112,7 @@ namespace DocFileFormat
 					if (lMinF <= point.x)
 					{
 						int index = (DWORD)point.x - 0x80000000;
-						if (index >= 0 && index < (int)guides.size())
+						if (index >= 0 && index < guides.size())
 						{
 							point.x = guides[index].param3;
 						}
@@ -120,7 +120,7 @@ namespace DocFileFormat
 					if (lMinF <= point.y)
 					{
 						int index = (DWORD)point.y - 0x80000000;
-						if (index >= 0 && index < (int)guides.size())
+						if (index >= 0 && index < guides.size())
 						{
 							point.y = guides[index].param3;
 						}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Record.cpp

@@ -50,9 +50,13 @@ namespace DocFileFormat
   /*========================================================================================================*/
 
   Record::Record( IBinaryReader* _reader, unsigned int bodySize, unsigned int typeCode, unsigned int version, unsigned int instance ):
-  HeaderSize(Record::HEADER_SIZE_IN_BYTES), BodySize(bodySize), RawData(NULL), SiblingIdx(0), TypeCode(typeCode), Version(version), Instance(instance), Reader(NULL),
+  HeaderSize(0), BodySize(0), RawData(NULL), SiblingIdx(0), TypeCode(0), Version(0), Instance(0), Reader(NULL),
   _ParentRecord(NULL)
   {
+    BodySize = bodySize;
+    TypeCode = typeCode;
+    Version = version;
+    Instance = instance;
 	HeaderSize = Record::HEADER_SIZE_IN_BYTES;
 
 	int real_size = _reader->GetSize() - _reader->GetPosition();

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/RecordFactory.cpp

@@ -76,7 +76,7 @@ namespace DocFileFormat
 			{
 				result = pRecord->NewObject (reader, size, typeCode, version, instance);
 				if (result)
-					result->SiblingIdx		=	siblingIdx;
+					result->SiblingIdx			=	siblingIdx;
 				RELEASEOBJECT(pRecord);
 			}
 		}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/RegularContainer.h

@@ -84,11 +84,11 @@ namespace DocFileFormat
 		{
 			T* firstChildWithType = NULL;
 
-			for ( size_t i = 0; i < this->Children.size(); ++i )
+			for ( std::vector<Record*>::const_iterator iter = this->Children.begin(); iter != this->Children.end(); iter++ )
 			{
-				if ( (this->Children[i] != NULL) && (typeid(T) == typeid(*(this->Children[i]))) )
+				if ( (*iter != NULL) && (typeid(T) == typeid(**iter)) )
 				{
-					firstChildWithType = static_cast<T*>(this->Children[i]);
+					firstChildWithType = static_cast<T*>(*iter);
 
 					break;
 				}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeContainer.h

@@ -34,7 +34,6 @@
 #include "RegularContainer.h"
 #include "ShapeOptions.h"
 #include "Shape.h"
-#include "ClientAnchor.h"
 
 namespace DocFileFormat
 {
@@ -43,35 +42,30 @@ namespace DocFileFormat
 	public:
 		static const unsigned short TYPE_CODE_0xF004 = 0xF004;
 
-		int				m_nIndex;
-		unsigned int	m_nShapeType;
-		bool			m_bBackground;
-		bool			m_bOLE;
-		bool			m_bSkip;
+		int Index;
 
 		ShapeContainer():
-		RegularContainer(), m_nIndex(0), m_nShapeType(0), m_bSkip(false), m_bBackground(false), m_bOLE(false)
+		RegularContainer(), Index(0)
 		{
 		}
 
-		ShapeContainer( IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance ) :
-		m_bSkip(false), m_bBackground(false), m_bOLE(false), m_nIndex(0), m_nShapeType(0), RegularContainer( _reader, size, typeCode, version, instance )
+		ShapeContainer( IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance ):
+		RegularContainer( _reader, size, typeCode, version, instance ), Index(0) 
 		{ 
-			for ( size_t i = 0; i < this->Children.size(); ++i )
-			{
-				ClientAnchor *clientAnchor = dynamic_cast<ClientAnchor*>( this->Children[i] );
-				//if ( (clientAnchor) && (clientAnchor->value == 0x80000000))
-				//	m_bSkip = true; //О реорганизации территориальных органов ПФР с 01.11.2018.doc
+		}
 
-				Shape* sh = dynamic_cast<Shape*>( this->Children[i] );
+		int getShapeType()
+		{
+			int ret = 0;
+
+			for ( std::vector<Record*>::const_iterator iter = this->Children.begin(); iter != this->Children.end(); iter++ )
+			{
+				Shape* sh = dynamic_cast<Shape*>( *iter );
 				if (sh)
 				{
-					m_bBackground	= sh->fBackground;
-					m_bOLE			= sh->fOleShape;
-
 					if (sh->shapeType) 
 					{
-						m_nShapeType = sh->shapeType->GetTypeCode();
+						return sh->shapeType->GetTypeCode();
 					}
 					else 
 					{
@@ -82,16 +76,44 @@ namespace DocFileFormat
 							{
 								if (sh_options->OptionsByID.end() != sh_options->OptionsByID.find(Pib))
 								{
-									m_nShapeType = msosptPictureFrame;
+									return msosptPictureFrame;
 								}
 							}
 						}
+						return 0;
 					}
 				}
-
 			}
+			return 0;
 		}
+		bool isBackground()
+		{
+			int ret = 0;
 
+			for ( std::vector<Record*>::const_iterator iter = this->Children.begin(); iter != this->Children.end(); iter++ )
+			{
+				Shape* sh = dynamic_cast<Shape*>( *iter );
+				if (sh)
+				{
+					return sh->fBackground;
+				}
+			}
+			return false;
+		}
+		bool isOLE()
+		{
+			int ret = 0;
+
+			for ( std::vector<Record*>::const_iterator iter = this->Children.begin(); iter != this->Children.end(); iter++ )
+			{
+				Shape* sh = dynamic_cast<Shape*>( *iter );
+				if (sh)
+				{
+					return sh->fOleShape;
+				}
+			}
+			return false;
+		}
 		virtual ~ShapeContainer()
 		{
 		}
@@ -101,32 +123,14 @@ namespace DocFileFormat
 			return new ShapeContainer( _reader, bodySize, typeCode, version, instance );
 		}
 
-		OptionEntryPtr ExtractOption(const PropertyId & prop) const
-		{
-			OptionEntryPtr ret;
-			for ( size_t i = 0; i < this->Children.size(); ++i )
-			{
-				ShapeOptions* opt = dynamic_cast<ShapeOptions*>( this->Children[i] );
-
-				if ( opt == NULL ) continue;
-
-				std::map<PropertyId, OptionEntryPtr>::iterator pFind = opt->OptionsByID.find(prop);
-				if (pFind != opt->OptionsByID.end())
-				{
-					ret = pFind->second;
-				}
-			}
-			return ret;
-		}
-
 		std::vector<OptionEntryPtr> ExtractOptions() const
 		{
 			std::vector<OptionEntryPtr> ret;
 
 			//build the list of all option entries of this shape
-			for ( size_t i = 0; i < this->Children.size(); ++i )
+			for ( std::vector<Record*>::const_iterator iter = this->Children.begin(); iter != this->Children.end(); iter++ )
 			{
-				ShapeOptions* opt = dynamic_cast<ShapeOptions*>( this->Children[i] );
+				ShapeOptions* opt = dynamic_cast<ShapeOptions*>( *iter );
 
 				if ( opt == NULL ) continue;
 				

ASCOfficeDocFile/DocDocxConverter/OleObject.cpp

@@ -104,7 +104,7 @@ OleObject::OleObject( const CharacterPropertyExceptions* chpx, WordDocument* doc
 				szData = szData >> 16;
 			}
 			unsigned char* bytes = reader.ReadBytes( szData, true );
-			if (bytes && szData < 0xffff)
+			if (bytes)
 			{
 				emeddedData = std::string((char*)bytes, szData);
 				delete []bytes;

ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.cpp

@@ -422,11 +422,12 @@ namespace DocFileFormat
 		//numbering
 				case sprmOldPAnld:
 				{
-					NumberingDescriptorPtr desc = NumberingDescriptor::create( iter->Arguments, iter->argumentsSize );
+					NumberingDescriptor desc( iter->Arguments, iter->argumentsSize );
 
 					if (m_document->listTable)
 					{
-						unsigned short numId = m_document->listTable->appendNumbering(  desc );
+						m_document->listTable->appendNumbering(  desc );
+						short numId = static_cast<short>(m_document->listTable->listNumbering.size());
                         appendValueElement( &numPr, L"numId", numId, true );
 					}
 				}break;
@@ -459,8 +460,7 @@ namespace DocFileFormat
 					//Todo разобраться с закоментированным кодом
 					if (NULL != m_document->listTable && false == m_document->listTable->listData.empty())
 					{
-						unsigned short numId = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-						appendValueElement( &numPr, L"numId", numId, true );
+                        appendValueElement( &numPr, L"numId", FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ), true );
 					}
 
 					//check if there is a ilvl reference, if not, check the count of LVLs.
@@ -566,35 +566,14 @@ namespace DocFileFormat
 
 				case sprmOldPDxaAbs:
 				case sprmPDxaAbs:
-				{
-					unsigned short val = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-					switch (val)
-					{
-					case 0x0000:	break; //left
-					case 0xfffc:	appendValueAttribute( _framePr, L"w:xAlign", L"center");	break;
-					case 0xfff8:	appendValueAttribute( _framePr, L"w:xAlign", L"right");		break;
-					case 0xfff4:	appendValueAttribute( _framePr, L"w:xAlign", L"inside");	break;
-					case 0xfff0:	appendValueAttribute( _framePr, L"w:xAlign", L"outside");	break;
-					default:
-						appendValueAttribute( _framePr, L"w:x",  (short)val);
-					}
-				}break;
+                    appendValueAttribute( _framePr, L"w:x", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
+					break;
+
 				case sprmOldPDyaAbs:
 				case sprmPDyaAbs:
-				{
-					unsigned short val = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-					switch (val)
-					{
-					case 0x0000:	break; //inline
-					case 0xfffc:	appendValueAttribute( _framePr, L"w:yAlign", L"top");		break;
-					case 0xfff8:	appendValueAttribute( _framePr, L"w:yAlign", L"center");	break;
-					case 0xfff4:	appendValueAttribute( _framePr, L"w:yAlign", L"bottom");	break;
-					case 0xfff0:	appendValueAttribute( _framePr, L"w:yAlign", L"inside");	break;
-					case 0xffec:	appendValueAttribute( _framePr, L"w:yAlign", L"outside");	break;
-					default:
-						appendValueAttribute( _framePr, L"w:y", (short)val );
-					}					
-				}break;
+                    appendValueAttribute( _framePr, L"w:y", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
+					break;
+
 				case sprmPWHeightAbs:
                     appendValueAttribute( _framePr, L"w:h", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
 					break;

ASCOfficeDocFile/DocDocxConverter/PictureDescriptor.cpp

@@ -244,8 +244,6 @@ namespace DocFileFormat
 			case sprmOldCFData:
 			case sprmCFData:
 				break;
-			default:
-				break;
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/Plex.h

@@ -48,7 +48,6 @@ namespace DocFileFormat
 		std::vector<ByteStructure*>	Elements;
 		bool						m_bIsValid;
 
-		std::map<int, int>			mapCP;
 	public:
 		Plex(int structureLength, POLE::Stream* stream, unsigned int fc, unsigned int lcb, int nWordVersion) 
 			: m_bIsValid(false), CP_LENGTH(/*nWordVersion == 2 ? 2 :*/ 4)
@@ -78,10 +77,7 @@ namespace DocFileFormat
 
 				for (int i = 0; i < (n + 1); ++i)
 				{
-					int val = reader.ReadInt32();
-
-					mapCP.insert(std::make_pair(val, (int)CharacterPositions.size()));
-					CharacterPositions.push_back(val);
+					CharacterPositions.push_back(reader.ReadInt32());
 				}
 
 				// read the n structs
@@ -100,9 +96,9 @@ namespace DocFileFormat
 
 		~Plex()
 		{
-			for (size_t i = 0; i < Elements.size(); ++i)
+			for (std::vector<ByteStructure*>::iterator iter = Elements.begin(); iter != Elements.end(); ++iter)
 			{
-				RELEASEOBJECT(Elements[i]);
+				RELEASEOBJECT(*iter);
 			}
 		}
 
@@ -113,14 +109,15 @@ namespace DocFileFormat
 		{
 			int index = -1;
 
-			std::map<int, int>::iterator pFind = mapCP.find(cp);
-
-			if (pFind != mapCP.end())
+			for (int i = 0; i < (int)CharacterPositions.size(); ++i)
 			{
-				index = pFind->second;
+				if (CharacterPositions[i] == cp)
+				{
+					index = i;
+					break;
+				}
 			}
 
-
 			if ((index >= 0) && (index < (int)Elements.size()))
 				return this->Elements[index];
 
@@ -131,11 +128,13 @@ namespace DocFileFormat
 		{
 			bool result = false;
 
-			std::map<int, int>::const_iterator pFind = mapCP.find(cp);
-
-			if (pFind != mapCP.end())
+			for (int i = 0; i < (int)CharacterPositions.size(); ++i)
 			{
-				result = true;
+				if (CharacterPositions[i] == cp)
+				{
+					result = true;
+					break;
+				}
 			}
 
 			return result;
@@ -143,7 +142,7 @@ namespace DocFileFormat
 
 		inline int operator [] (unsigned int index) const
 		{
-			if (index < (unsigned int)CharacterPositions.size())
+			if (index < CharacterPositions.size())
 				return CharacterPositions[index];
 
 			return -1;

ASCOfficeDocFile/DocDocxConverter/RevisionData.cpp

@@ -117,8 +117,6 @@ namespace DocFileFormat
 					this->RsidDel = FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize );
 				}
 				break;
-			default:
-				break;
 			}
 
 			//put the sprm on the revision stack

ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.cpp

@@ -130,8 +130,6 @@ namespace DocFileFormat
 							appendValueAttribute( &pgBorders, L"w:display", L"notFirstPage" );
 
 					}break;
-					default:
-						break;
 				}
 			}
 			if (_ctx->_doc->nWordVersion == 2)

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp

@@ -92,8 +92,6 @@ namespace DocFileFormat
 				{
 					iTap_current = FormatUtils::BytesToUInt32( iter->Arguments, 0, iter->argumentsSize );
 				}break;
-				default:
-					break;
 			}
 		}
 		std::list<SinglePropertyModifier>::const_reverse_iterator rend = tapx->grpprl->rend();
@@ -320,22 +318,8 @@ namespace DocFileFormat
 					}
 				}
 				break;
-				default:
-					break;
 			}
 		}
-		if (_gridSpan <= 1 && nComputedCellWidth > _width && _width > 1)
-		{
-			int width_current = 0;
-			for (int i = _gridIndex; i < _grid->size();  i++)
-			{
-				width_current += _grid->at(i);
-				if (width_current >= nComputedCellWidth)
-					break;
-				_gridSpan++;
-			}
-			_width = nComputedCellWidth;
-		}
 
 		XMLTools::XMLElement    tcW     ( L"w:tcW" );
 		
@@ -349,23 +333,22 @@ namespace DocFileFormat
 		_tcPr->AppendChild( tcW );
 
 
-		if ( _gridSpan == 1 && ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidth > _grid->at( _gridIndex ) ) )
-		{
-			//check the number of merged cells
-			int w = _grid->at( _gridIndex );
+		//if ( ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidth > _grid->at( _gridIndex ) ) )
+		//{
+		//	//check the number of merged cells
+		//	int w = _grid->at( _gridIndex );
 
-			for ( size_t i = _gridIndex + 1; i < _grid->size(); i++ )
-			{
-				_gridSpan++;
+		//	for ( size_t i = _gridIndex + 1; i < _grid->size(); i++ )
+		//	{
+		//		_gridSpan++;
 
-				w += _grid->at( i );
+		//		w += _grid->at( i );
 
-				if ( w >= nComputedCellWidth )
-				{
-					break;
-				}
-			}
-		}
+		//		if ( w >= nComputedCellWidth )
+		//		{
+		//			break;
+		//		}
+		//	}
 		if (_gridSpan > 1)
 		{
             appendValueElement( _tcPr, L"gridSpan", FormatUtils::IntToWideString( _gridSpan ), true );

ASCOfficeDocFile/DocDocxConverter/TableRowPropertiesMapping.cpp

@@ -70,7 +70,9 @@ namespace DocFileFormat
 				case sprmTDefTable:
 				{
 					//SprmTDefTable tdef = new SprmTDefTable(sprm.Arguments);
-				}break;	
+				}
+				break;
+
 				case sprmOldTTableHeader:
 				case sprmTTableHeader:
 				{						//header row
@@ -82,7 +84,9 @@ namespace DocFileFormat
                         XMLTools::XMLElement header( L"w:tblHeader" );
 						_trPr->AppendChild( header );
 					}
-				}break;	
+				}
+				break;
+
 				case sprmTWidthAfter:
 				{						//width after
                     XMLTools::XMLElement wAfter( L"w:wAfter" );
@@ -92,7 +96,9 @@ namespace DocFileFormat
                     XMLTools::XMLAttribute wAfterType( L"w:type", L"dxa" );
 					wAfter.AppendAttribute( wAfterType );
 					_trPr->AppendChild( wAfter, true );
-				}break;	
+				}
+				break;
+
 				case sprmTWidthBefore:
 				{						//width before
 					short before = FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize );
@@ -107,7 +113,9 @@ namespace DocFileFormat
 						wBefore.AppendAttribute( wBeforeType );
 						_trPr->AppendChild( wBefore, true );
 					}
-				}break;	
+				}
+				break;
+
 				case sprmOldTDyaRowHeight:
 				case sprmTDyaRowHeight:
 				{						//row height
@@ -139,19 +147,20 @@ namespace DocFileFormat
 					_trPr->AppendChild( rowHeight );
 				}
 				break;
-				case sprmOldTFCantSplit:
-				case sprmTFCantSplit:
-				case sprmTFCantSplit90:
-				{						//can't split
-					appendFlagElement( _trPr, *iter, L"cantSplit", true );
-				}break;
 
-					//div id
-				case sprmTIpgp:// = PGPInfo.ipgpSelf (PGPInfo structure describes the border and margin properties)
-				{
-				}break;
-				default:
-					break;
+			case sprmOldTFCantSplit:
+			case sprmTFCantSplit:
+			case sprmTFCantSplit90:
+			{						//can't split
+                appendFlagElement( _trPr, *iter, L"cantSplit", true );
+			}break;
+
+				//div id
+			case sprmTIpgp:
+			{
+                appendValueElement( _trPr, L"divId", FormatUtils::IntToWideString( FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize ) ), true );
+			}break;
+
 				//borders 80 exceptions
 				//case SinglePropertyModifier.OperationCode.sprmTTableBorders80:
 				//    unsigned char[] brc80 = new unsigned char[4];

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -142,7 +142,7 @@ namespace DocFileFormat
 	{
 		newXmlString.clear();
 
-		std::wstring sTempFolder = m_context->_doc->m_sTempFolder;
+		std::wstring sTempFolder = m_ctx->_doc->m_sTempFolder;
 		if (sTempFolder.empty())
 		{
             sTempFolder = NSFile::CFileBinary::GetTempPath();
@@ -211,7 +211,7 @@ namespace DocFileFormat
 
 	VMLPictureMapping::VMLPictureMapping(ConversionContext* ctx, XMLTools::CStringXmlWriter* writer, bool olePreview, IMapping* caller, bool isInlinePicture) : PropertiesMapping(writer)
 	{
-		m_context			=	ctx;
+		m_ctx				=	ctx;
 		m_isOlePreview		=	olePreview;
 		m_imageData			=	NULL;
 		m_nImageId			=	0;
@@ -229,18 +229,7 @@ namespace DocFileFormat
 	{
 		RELEASEOBJECT(m_imageData);
 	}
-	std::wstring VMLPictureMapping::GetShapeID(const Shape* pShape) const
-	{
-		std::wstring strXmlAttr;
 
-		if (NULL != pShape)
-		{
-			strXmlAttr += std::wstring(L"_x0000_i");
-			strXmlAttr += FormatUtils::IntToWideString(pShape->GetShapeID());
-		}
-
-		return strXmlAttr;
-	}
 	void VMLPictureMapping::Apply( IVisitable* visited  )
 	{
 		PictureDescriptor* pict = dynamic_cast<PictureDescriptor*>(visited);
@@ -259,14 +248,13 @@ namespace DocFileFormat
 		std::vector<OptionEntryPtr> options;
 		
 		PictureFrameType type;
-		Shape* pShape = NULL;
 		if ((pict->shapeContainer || pict->blipStoreEntry) && pict->shapeContainer->Children.size() > 0)
 		{
-			pShape	=	static_cast<Shape*>(*(pict->shapeContainer->Children.begin()));
-			options	=	pict->shapeContainer->ExtractOptions();
+			Shape* shape	=	static_cast<Shape*>(*(pict->shapeContainer->Children.begin()));
+			options			=	pict->shapeContainer->ExtractOptions();
 
 			//v:shapetype
-			type.SetType(pShape->Instance);
+			type.SetType(shape->Instance);
 			
 			VMLShapeTypeMapping* vmlShapeTypeMapping = new VMLShapeTypeMapping( m_pXmlWriter, m_isInlinePicture );
 
@@ -277,16 +265,13 @@ namespace DocFileFormat
 		{
 			type.SetType(msosptPictureFrame);
 		}
-		m_pXmlWriter->WriteNodeBegin( L"v:shape", true );		
-
-		//m_shapeId = GetShapeID(pShape); - todooo одинаковые картинки (одинаковый spid) - Anexo№3.doc
+		m_pXmlWriter->WriteNodeBegin( L"v:shape", true );
 		
 
+		count_vml_objects++;
+
 		if (m_shapeId.empty())
-		{
-			m_context->_doc->GetOfficeArt()->m_uLastShapeId++;
-			m_shapeId =	L"_x0000_i" + FormatUtils::IntToWideString(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
-		}
+			m_shapeId =	L"_x0000_s" + FormatUtils::IntToWideString(1024 + count_vml_objects);
 		
 		m_pXmlWriter->WriteAttribute( L"id", m_shapeId);
 		
@@ -324,28 +309,24 @@ namespace DocFileFormat
 				}break;
 //BORDERS
 			case borderBottomColor:
-				if (!pict->brcBottom)
 				{
 					RGBColor bottomColor( (int)iter->op, RedFirst );
 					m_pXmlWriter->WriteAttribute( L"o:borderbottomcolor", L"#" + bottomColor.SixDigitHexCode);
 				}
 				break;
 			case borderLeftColor:
-				if (!pict->brcLeft)
 				{  
 					RGBColor leftColor( (int)iter->op, RedFirst );
 					m_pXmlWriter->WriteAttribute( L"o:borderleftcolor", L"#" + leftColor.SixDigitHexCode);
 				}  
 				break;
 			case borderRightColor:
-				if (!pict->brcRight)
 				{  
 					RGBColor rightColor( (int)iter->op, RedFirst );
 					m_pXmlWriter->WriteAttribute( L"o:borderrightcolor",  L"#" + rightColor.SixDigitHexCode);
 				}
 				break;
 			case borderTopColor:
-				if (!pict->brcTop)
 				{
 					RGBColor topColor( (int)iter->op, RedFirst );
 					m_pXmlWriter->WriteAttribute( L"o:bordertopcolor", L"#" + topColor.SixDigitHexCode);
@@ -427,9 +408,8 @@ namespace DocFileFormat
 					{
 						appendStyleProperty(&strStyle, L"visibility", L"hidden");
 					}
-				}break;
-			default:
-				break;				
+				}
+				break;
 			}
 		}
 
@@ -463,15 +443,14 @@ namespace DocFileFormat
 		}
 		m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 		
-		//v:imageData
 		if (CopyPicture(pict))
 		{
+			//v:imageData
 			appendValueAttribute(m_imageData, L"r:id", L"rId" + FormatUtils::IntToWideString(m_nImageId));
 			appendValueAttribute(m_imageData, L"o:title", L"" );
 			m_pXmlWriter->WriteString(m_imageData->GetXMLString());
 		}
 
-
 		{//borders			
 			writePictureBorder( L"bordertop",		pict->brcTop );
 			writePictureBorder( L"borderleft",		pict->brcLeft );
@@ -531,10 +510,10 @@ namespace DocFileFormat
 				pict->embeddedData = newData;
 
 			}
-			m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(Global::msoblipDIB), 
+			m_ctx->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(Global::msoblipDIB), 
 					std::vector<unsigned char>(pict->embeddedData, (pict->embeddedData + pict->embeddedDataSize)), Global::msoblipDIB));
 			
-			m_nImageId	=	m_context->_docx->RegisterImage(m_caller, btWin32);
+			m_nImageId	=	m_ctx->_docx->RegisterImage(m_caller, btWin32);
 			result	=	true;
 		}
 		else if ((oBlipEntry != NULL) && (oBlipEntry->Blip != NULL))
@@ -551,7 +530,7 @@ namespace DocFileFormat
 						unsigned char *newData	= NULL;
 						int newDataSize = metaBlip->oMetaFile.ToBuffer(newData);
 						
-						m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlipEntry->btWin32), std::vector<unsigned char>(newData, (newData + newDataSize))));
+						m_ctx->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlipEntry->btWin32), std::vector<unsigned char>(newData, (newData + newDataSize))));
 						
 						RELEASEARRAYOBJECTS(newData);
 					}
@@ -567,7 +546,7 @@ namespace DocFileFormat
 					BitmapBlip* bitBlip = static_cast<BitmapBlip*>(oBlipEntry->Blip);
 					if (bitBlip)
 					{
-						m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlipEntry->btWin32), 
+						m_ctx->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlipEntry->btWin32), 
 							std::vector<unsigned char>(bitBlip->m_pvBits, (bitBlip->m_pvBits + bitBlip->pvBitsSize)), oBlipEntry->btWin32));
 					}
 				}break;			
@@ -578,7 +557,7 @@ namespace DocFileFormat
 				}break;
 			}
 
-			m_nImageId	=	m_context->_docx->RegisterImage(m_caller, oBlipEntry->btWin32);
+			m_nImageId	=	m_ctx->_docx->RegisterImage(m_caller, oBlipEntry->btWin32);
 			result	=	true;
 		}
 

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.h

@@ -58,7 +58,6 @@ namespace DocFileFormat
 		void writePictureBorder (const std::wstring & name, const BorderCode* brc);
 		void appendStyleProperty( std::wstring* b, const std::wstring& propName, const std::wstring& propValue ) const;
 		bool ParseEmbeddedEquation( const std::string & xmlString, std::wstring & newXmlString );
-		std::wstring GetShapeID(const Shape* pShape) const;
 	protected:
 		/// Copies the picture from the binary stream to the zip archive 
 		/// and creates the relationships for the image.
@@ -78,7 +77,7 @@ namespace DocFileFormat
 		std::wstring					m_shapeId;
 	private:
 		
-		ConversionContext*				m_context;
+		ConversionContext*				m_ctx;
 		IMapping*						m_caller;
 		int								m_nImageId;
 		

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -168,8 +168,6 @@ namespace DocFileFormat
 							m_pXmlWriter->WriteAttribute(L"wrapcoords", wrapCoords);
 					}
 					break;
-					default:
-						break;
 				}
 			}
 
@@ -237,11 +235,10 @@ namespace DocFileFormat
 
 		m_shapeId = GetShapeID(pShape);
 
+		count_vml_objects++;
+
 		if (m_shapeId.empty())
-		{
-			m_context->_doc->GetOfficeArt()->m_uLastShapeId++;
-			m_shapeId =	std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
-		}
+			m_shapeId =	std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(1024 + count_vml_objects);
 		
 		m_pXmlWriter->WriteAttribute ( L"id", m_shapeId );
 
@@ -252,7 +249,7 @@ namespace DocFileFormat
 				freeform =	false;
 				m_pXmlWriter->WriteAttribute( L"type", (std::wstring(L"#") + VMLShapeTypeMapping::GenerateTypeId(pShape->GetShapeType())));
 			}
-			m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(pShape, pAnchor, options, pContainer->m_nIndex)));
+			m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(pShape, pAnchor, options, pContainer->Index)));
 
 			if (pShape->is<LineType>())
 			{
@@ -1684,8 +1681,6 @@ namespace DocFileFormat
 				{
 					appendStyleProperty(oStyle, L"mso-wrap-distance-top", (FormatUtils::DoubleToWideString(EmuValue((int)iter->op).ToPoints()) + std::wstring(L"pt")));
 				}break;
-			default:
-				break;
 			}
 		}
 		
@@ -1823,12 +1818,12 @@ namespace DocFileFormat
 	{
 		switch ( op )
 		{
+			default:	return L"none";
 			case 1:		return L"block";
 			case 2:		return L"classic";
 			case 3:		return L"diamond";
 			case 4:		return L"oval";
 			case 5:		return L"open";
-			default:	return L"none";
 		}
 	}
 
@@ -1836,9 +1831,9 @@ namespace DocFileFormat
 	{
 		switch ( op )
 		{
+			default:	return L"short";
 			case 1:		return L"medium";
 			case 2:		return L"long";
-			default:	return L"short";
 		}
 	}
 
@@ -1846,9 +1841,9 @@ namespace DocFileFormat
 	{
 		switch ( op )
 		{
+			default:	return L"narrow";
 			case 1:		return L"medium";
 			case 2:		return L"wide";
-			default:	return L"narrow";
 		}
 	}
 
@@ -2270,10 +2265,9 @@ namespace DocFileFormat
 		TwipsValue w( primitive->dxa );
 		TwipsValue h( primitive->dya );
 
-		m_context->_doc->GetOfficeArt()->m_uLastShapeId++;
-
-		std::wstring strId = std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
+		std::wstring strId = std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(1024 + count_vml_objects);
 		
+		count_vml_objects++;
 		//m_pXmlWriter->WriteAttribute ( L"id")	, strId);
 		m_pXmlWriter->WriteAttribute ( L"o:spid", strId);
 

ASCOfficeDocFile/DocDocxConverter/VMLShapeTypeMapping.cpp

@@ -124,12 +124,12 @@ namespace DocFileFormat
 			else if (_isInlineShape)
 			{
                 m_pXmlWriter->WriteString(L"<v:formulas><v:f eqn=\"if lineDrawn pixelLineWidth 0\"/>\
-<v:f eqn=\"sum @0 1 0\"/><v:f eqn=\"sum 0 0 @1\"/>\
-<v:f eqn=\"prod @2 1 2\"/><v:f eqn=\"prod @3 21600 pixelWidth\"/>\
-<v:f eqn=\"prod @3 21600 pixelHeight\"/><v:f eqn=\"sum @0 0 1\"/>\
-<v:f eqn=\"prod @6 1 2\"/><v:f eqn=\"prod @7 21600 pixelWidth\"/>\
-<v:f eqn=\"sum @8 21600 0\"/><v:f eqn=\"prod @7 21600 pixelHeight\"/>\
-<v:f eqn=\"sum @10 21600 0\"/></v:formulas>");
+											 <v:f eqn=\"sum @0 1 0\"/><v:f eqn=\"sum 0 0 @1\"/>\
+											 <v:f eqn=\"prod @2 1 2\"/><v:f eqn=\"prod @3 21600 pixelWidth\"/>\
+											 <v:f eqn=\"prod @3 21600 pixelHeight\"/><v:f eqn=\"sum @0 0 1\"/>\
+											 <v:f eqn=\"prod @6 1 2\"/><v:f eqn=\"prod @7 21600 pixelWidth\"/>\
+											 <v:f eqn=\"sum @8 21600 0\"/><v:f eqn=\"prod @7 21600 pixelHeight\"/>\
+                                             <v:f eqn=\"sum @10 21600 0\"/></v:formulas>");
 			}
 
 			// Path

ASCOfficeDocFile/DocDocxConverter/VMLShapeTypeMapping.h

@@ -37,6 +37,8 @@
 
 namespace DocFileFormat
 {
+	static int count_vml_objects = 0;
+
 	class VMLShapeTypeMapping: public PropertiesMapping, public IMapping
 	{
 	private: 

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -85,7 +85,7 @@ namespace DocFileFormat
 		IndividualFootnotesPlex(NULL), FootnoteReferenceCharactersPlex(NULL), IndividualEndnotesPlex(NULL),
 		EndnoteReferenceCharactersPlex(NULL), FieldsPlex(NULL), FootnoteDocumentFieldsPlex(NULL),
 		EndnoteDocumentFieldsPlex(NULL), HeadersAndFootersDocumentFieldsPlex(NULL), HeaderStoriesPlex(NULL),
-		AnnotationsReferencePlex(NULL), AnnotationsReferenceExPlex(NULL), IndividualCommentsPlex(NULL), TextboxBreakPlex(NULL), TextboxBreakPlexHeader(NULL),
+		AnnotationsReferencePlex(NULL), IndividualCommentsPlex(NULL), TextboxBreakPlex(NULL), TextboxBreakPlexHeader(NULL),
 		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),
@@ -117,7 +117,7 @@ namespace DocFileFormat
 
 namespace DocFileFormat
 {
-	_UINT32 WordDocument::LoadDocument(const std::wstring & fileName, const std::wstring & password)
+	int WordDocument::LoadDocument(const std::wstring & fileName, const std::wstring & password)
 	{
 		m_sFileName = fileName;
 		m_sPassword = password;
@@ -318,8 +318,8 @@ namespace DocFileFormat
 		// Read all needed PLCFs
 		if (FIB->m_RgLw97.ccpFtn > 0)
 		{
-			FootnoteReferenceCharactersPlex	=	new Plex<FootnoteDescriptor>(FootnoteDescriptor::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcffndRef, FIB->m_FibWord97.lcbPlcffndRef, nWordVersion);
 			IndividualFootnotesPlex			=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE,			TableStream, FIB->m_FibWord97.fcPlcffndTxt, FIB->m_FibWord97.lcbPlcffndTxt, nWordVersion);
+			FootnoteReferenceCharactersPlex	=	new Plex<FootnoteDescriptor>(FootnoteDescriptor::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcffndRef, FIB->m_FibWord97.lcbPlcffndRef, nWordVersion);
 		}
 	
 		if (nWordVersion > 0 && FIB->m_FibWord97.lcbPlcPad > 0)
@@ -329,8 +329,8 @@ namespace DocFileFormat
 
 		if (FIB->m_RgLw97.ccpEdn > 0)
 		{
-			EndnoteReferenceCharactersPlex	=	new Plex<EndnoteDescriptor>(EndnoteDescriptor::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfendRef, FIB->m_FibWord97.lcbPlcfendRef, nWordVersion);
 			IndividualEndnotesPlex			=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE,			TableStream, FIB->m_FibWord97.fcPlcfendTxt, FIB->m_FibWord97.lcbPlcfendTxt, nWordVersion);
+			EndnoteReferenceCharactersPlex	=	new Plex<EndnoteDescriptor>(EndnoteDescriptor::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfendRef, FIB->m_FibWord97.lcbPlcfendRef, nWordVersion);
 		}
 
 		if (FIB->m_RgLw97.ccpHdr > 0)
@@ -338,16 +338,11 @@ namespace DocFileFormat
 			HeaderStoriesPlex =	new Plex<EmptyStructure>( EmptyStructure::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfHdd, FIB->m_FibWord97.lcbPlcfHdd, nWordVersion);
 		}
 
-        if (FIB->m_RgLw97.ccpAtn > 0)
+		if (FIB->m_RgLw97.ccpAtn > 0)
 		{
 			AnnotationsReferencePlex		=	new Plex<AnnotationReferenceDescriptor>(AnnotationReferenceDescriptor::GetSize(nWordVersion), TableStream, FIB->m_FibWord97.fcPlcfandRef, FIB->m_FibWord97.lcbPlcfandRef, nWordVersion);
 			IndividualCommentsPlex			=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfandTxt,		FIB->m_FibWord97.lcbPlcfandTxt,		nWordVersion);
 		}
-
-		if (FIB->m_FibWord2002.lcbAtrdExtra > 0)
-		{
-			AnnotationsReferenceExPlex	=	new Plex<AnnotationReferenceExDescriptor>(AnnotationReferenceExDescriptor::GetSize(nWordVersion), TableStream, FIB->m_FibWord2002.fcAtrdExtra, FIB->m_FibWord2002.lcbAtrdExtra, nWordVersion);
-		}
 		OfficeDrawingPlex					=	new Plex<Spa>				(Spa::GetSize(nWordVersion),		TableStream, FIB->m_FibWord97.fcPlcSpaMom,		FIB->m_FibWord97.lcbPlcSpaMom,		nWordVersion);
 		OfficeDrawingPlexHeader				=	new Plex<Spa>				(Spa::GetSize(nWordVersion),		TableStream, FIB->m_FibWord97.fcPlcSpaHdr,		FIB->m_FibWord97.lcbPlcSpaHdr,		nWordVersion);
 
@@ -361,7 +356,7 @@ namespace DocFileFormat
 		TextboxBreakPlex					=	new Plex<Tbkd>				(Tbkd::STRUCTURE_SIZE,				TableStream, FIB->m_FibWord97.fcPlcfTxbxBkd,	FIB->m_FibWord97.lcbPlcfTxbxBkd,	nWordVersion);
 		TextboxBreakPlexHeader				=	new Plex<Tbkd>				(Tbkd::STRUCTURE_SIZE,				TableStream, FIB->m_FibWord97.fcPlcfTxbxHdrBkd, FIB->m_FibWord97.lcbPlcfTxbxHdrBkd, nWordVersion);
 
-		AnnotStartPlex						=	new Plex<BookmarkFirst>		(BookmarkFirst::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfAtnBkf,		FIB->m_FibWord97.lcbPlcfAtnBkf,		nWordVersion);
+		AnnotStartPlex						=	new Plex<BookmarkFirst>		(BookmarkFirst::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfAtnBkf,		FIB->m_FibWord97.lcbPlcfAtnBkf,		nWordVersion);
 		AnnotEndPlex						=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfAtnBkl,		FIB->m_FibWord97.lcbPlcfAtnBkl,		nWordVersion);
 		
 
@@ -373,19 +368,18 @@ namespace DocFileFormat
 				BookmarkStartEndCPs.push_back(std::make_pair(BookmarkStartPlex->CharacterPositions[i], BookmarkEndPlex->CharacterPositions[pBookmark->GetIndex()]));
 			}
 		}
-		for (size_t i = 0; AnnotStartPlex && i < AnnotStartPlex->Elements.size(); ++i)
+		for (size_t i = 0; i < AnnotStartPlex->Elements.size(); ++i)
 		{
-			BookmarkFirst* pBookmark = static_cast<BookmarkFirst*>(AnnotStartPlex->Elements[i]);
+			BookmarkFirst* pBookmark		=	static_cast<BookmarkFirst*>(AnnotStartPlex->Elements[i]);
 			if (pBookmark)
 			{
-				short ind = pBookmark->GetIndex();
-				if (i < AnnotStartPlex->CharacterPositions.size() -1 )
+				short end = pBookmark->GetIndex();
+				if (i < AnnotStartPlex->CharacterPositions.size() && end < AnnotEndPlex->CharacterPositions.size())
 				{
-					AnnotStartEndCPs.push_back(std::make_pair(AnnotStartPlex->CharacterPositions[i], AnnotEndPlex->CharacterPositions[i + 1]));
+					AnnotStartEndCPs.push_back(std::make_pair(AnnotStartPlex->CharacterPositions[i], AnnotEndPlex->CharacterPositions[end]));
 				}
 			}
 		}
-
 		AutoTextPlex						=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfGlsy,   FIB->m_FibWord97.lcbPlcfGlsy, nWordVersion);
 		FieldsPlex							=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldMom, FIB->m_FibWord97.lcbPlcfFldMom, nWordVersion);
 		FootnoteDocumentFieldsPlex			=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldFtn, FIB->m_FibWord97.lcbPlcfFldFtn, nWordVersion);
@@ -423,7 +417,7 @@ namespace DocFileFormat
 			AnnotationOwners		=	new AnnotationOwnerList		(FIB, TableStream);
 		}
 
-        if (m_pCallFunc)
+		if (m_pCallFunc)
 		{
 			m_pCallFunc->OnProgress(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 300000 );
 
@@ -441,24 +435,24 @@ namespace DocFileFormat
 			std::unordered_map<int, int> fonts_charsets;
 			bool bFontsCodePage = false;
 
-            for ( size_t i = 0; FIB->m_FibWord97.lcbClx > 0 && !bFontsCodePage &&  i < FontTable->Data.size(); ++i)
+			for ( std::vector<ByteStructure*>::iterator iter = FontTable->Data.begin(); !bFontsCodePage &&  iter != FontTable->Data.end(); iter++ )
 			{
-                FontFamilyName* font = dynamic_cast<FontFamilyName*>( FontTable->Data[i]);
+				FontFamilyName* font = dynamic_cast<FontFamilyName*>( *iter );
 				if (!font) continue;
 
 				if (fonts_charsets.find(font->chs) == fonts_charsets.end())
 				{
 					fonts_charsets.insert(std::make_pair(font->chs, font->ff));
 					
-                    for (size_t j = 0 ; j < 32; j++)
-                    {
-                        if (aCodePages[j][0] == font->chs && font->chs > 2)
-                        {
-                            nFontsCodePage = aCodePages[j][1];
-                            bFontsCodePage = true;
-                            break;
-                        }
-                    }
+					for (int i = 0 ; i < sizeof(aCodePages) / 2; i++)
+					{
+						if (aCodePages[i][0] == font->chs && font->chs != 0)
+						{
+							nFontsCodePage = aCodePages[i][1];
+							bFontsCodePage = true;
+							break;
+						}
+					}	
 				}
 			}
 		}
@@ -471,7 +465,7 @@ namespace DocFileFormat
 			Text			= m_PieceTable->GetAllEncodingText (WordDocumentStream);
 		}
 		
-        if (FIB->m_FibWord97.lcbClx < 1 || ((Text) && (Text->empty())))
+		if (FIB->m_FibWord97.lcbClx < 1 || ((Text) && (Text->empty())))
 		{
 			int cb = FIB->m_FibBase.fcMac - FIB->m_FibBase.fcMin;
 
@@ -494,13 +488,13 @@ namespace DocFileFormat
 
 		if (BookmarkNames)
 		{
-			for (size_t i = 0; i < BookmarkStartEndCPs.size(); ++i)
+			for (unsigned int i = 0; i < BookmarkStartEndCPs.size(); ++i)
 			{
 				WideString* bookmarkName = static_cast<WideString*>(BookmarkNames->operator[]( i ));
 
                 if ( ( bookmarkName != NULL ) && ( *bookmarkName == L"_PictureBullets" ) )
 				{
-					for (size_t j = BookmarkStartEndCPs[i].first, k = 0; j < Text->size(); ++j, ++k )
+					for (unsigned int j = BookmarkStartEndCPs[i].first, k = 0; j < Text->size(); ++j, ++k )
 					{
 						if ( Text->at( j ) == 1 )
 						{
@@ -546,7 +540,7 @@ namespace DocFileFormat
 		{
 			AllSepx = new std::map<int, SectionPropertyExceptions*>();
 
-			for (size_t i = 0; i < SectionPlex->Elements.size(); ++i)
+			for (unsigned int i = 0; i < SectionPlex->Elements.size(); ++i)
 			{
 				//Read the SED
 				SectionDescriptor* sed = static_cast<SectionDescriptor*>(SectionPlex->Elements.at(i));
@@ -875,7 +869,6 @@ namespace DocFileFormat
 		RELEASEOBJECT(HeaderStoriesPlex);
 		RELEASEOBJECT(IndividualCommentsPlex);
 		RELEASEOBJECT(AnnotationsReferencePlex);
-		RELEASEOBJECT(AnnotationsReferenceExPlex);
 		RELEASEOBJECT(TextboxBreakPlex);
 		RELEASEOBJECT(TextboxBreakPlexHeader);
 		RELEASEOBJECT(OfficeDrawingPlex);

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -94,7 +94,7 @@ namespace DocFileFormat
 		WordDocument (const ProgressCallback* pCallFunc, const std::wstring & tempFolder );
 		virtual ~WordDocument();
 
-		_UINT32 LoadDocument(const std::wstring & fileName, const std::wstring & password);
+		int LoadDocument(const std::wstring & fileName, const std::wstring & password);
 
 		int		nWordVersion;
 		int		nDocumentCodePage;
@@ -224,7 +224,6 @@ namespace DocFileFormat
 		Plex<FieldCharacter>				*EndnoteDocumentFieldsPlex;
 		Plex<FieldCharacter>				*HeadersAndFootersDocumentFieldsPlex;
 		Plex<AnnotationReferenceDescriptor> *AnnotationsReferencePlex;
-		Plex<AnnotationReferenceExDescriptor> *AnnotationsReferenceExPlex;
 		Plex<EmptyStructure>				*AutoTextPlex;		
 		// Each character position specifies the beginning of a range of text that constitutes the contents of an AutoText item
 		

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

@@ -34,7 +34,6 @@
 
 #include "../../DesktopEditor/raster/BgraFrame.h"
 #include "../../DesktopEditor/common/Directory.h"
-#include "../../DesktopEditor/common/SystemUtils.h"
 
 #include "../../Common/DocxFormat/Source/DocxFormat/App.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/Core.h"
@@ -225,10 +224,7 @@ namespace DocFileFormat
 		OOX::CApp* pApp = new OOX::CApp(NULL);
 		if (pApp)
 		{
-			std::wstring sApplication = NSSystemUtils::GetEnvVariable(NSSystemUtils::gc_EnvApplicationName);
-			if (sApplication.empty())
-				sApplication = NSSystemUtils::gc_EnvApplicationNameDefault;
-			pApp->SetApplication(sApplication);
+			pApp->SetApplication(L"ONLYOFFICE");
 	#if defined(INTVER)
 			pApp->SetAppVersion(VALUE2STR(INTVER));
 	#endif

ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp

@@ -34,9 +34,9 @@
 #include "../DocDocxConverter/Converter.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
-_UINT32 COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack)
+HRESULT COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack)
 {
-	_UINT32 hr = 0;
+	HRESULT hr = S_FALSE;
 
 	DocFileFormat::Converter docToDocx;
 	docToDocx.m_sTempFolder = m_sTempFolder;
@@ -46,7 +46,7 @@ _UINT32 COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::w
 	return hr;
 }
 
-_UINT32 COfficeDocFile::SaveToFile (const std::wstring &  sDstFileName, const std::wstring &   sSrcFileName, ProgressCallback *ffCallBack )
+HRESULT COfficeDocFile::SaveToFile (const std::wstring &  sDstFileName, const std::wstring &   sSrcFileName, ProgressCallback *ffCallBack )
 {
-    return 0;
+    return S_OK;
 }

ASCOfficeDocFile/DocFormatLib/DocFormatLib.h

@@ -53,8 +53,8 @@ public:
 
 	std::wstring m_sTempFolder;
 
-    _UINT32 LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstFileName, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack = NULL);
-    _UINT32 SaveToFile(const std::wstring &  sDstFileName, const std::wstring &  sSrcFileName, 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

@@ -172,7 +172,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj

@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../DesktopEditor/xml/build/vs2005;../../DesktopEditor/xml/libxml2/include;../../DesktopEditor/freetype-2.5.2/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -205,7 +205,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\..\..\Common\OfficeDrawing;&quot;..\..\..\..\..\DesktopEditor\freetype-2.5.2\include&quot;;..\..\..\..\..\Common\OfficeDrawing\Shapes"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -373,10 +373,6 @@
 				RelativePath="..\..\XlsxSerializerCom\Writer\CSVWriter.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\ASCOfficeDocxFile2\BinReader\CustormXmlWriter.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\DocxSerializer.cpp"
 				>

ASCOfficeDocxFile2/BinReader/CustormXmlWriter.cpp

@@ -1,76 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2018
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-
-#include "CustormXmlWriter.h"
-#include "../../Common/DocxFormat/Source/DocxFormat/CustomXml.h"
-#include "../../ASCOfficePPTXFile/ASCOfficeDrawingConverter.h"
-
-namespace Writers
-{
-	CustomXmlWriter::CustomXmlWriter(std::wstring sDir, NSBinPptxRW::CDrawingConverter* pDrawingConverter):m_sDir(sDir),m_pDrawingConverter(pDrawingConverter)
-	{
-		m_nCount = 0;
-	}
-	std::wstring CustomXmlWriter::WriteCustomXml(const std::wstring& sUrl, const std::wstring& sXml)
-	{
-		m_nCount++;
-		OOX::CCustomXMLProps oCustomXMLProps(NULL);
-		OOX::CCustomXMLProps::CShemaRef* pShemaRef = new OOX::CCustomXMLProps::CShemaRef();
-		pShemaRef->m_sUri = sUrl;
-		//todo guid
-		oCustomXMLProps.m_oItemID.FromString(L"{5D0AEA6B-E499-4EEF-98A3-AFBB261C493E}");
-		oCustomXMLProps.m_oShemaRefs.Init();
-		oCustomXMLProps.m_oShemaRefs->m_arrItems.push_back(pShemaRef);
-
-		std::wstring sCustomXmlPropsDir = m_sDir + FILE_SEPARATOR_STR;
-		sCustomXmlPropsDir += OOX::FileTypes::CustomXmlProps.DefaultDirectory().GetPath();
-		NSDirectory::CreateDirectories(sCustomXmlPropsDir);
-		std::wstring  sCustomXMLPropsFilename = OOX::FileTypes::CustomXmlProps.DefaultFileName().GetBasename();
-		sCustomXMLPropsFilename += std::to_wstring(m_nCount) + OOX::FileTypes::CustomXmlProps.DefaultFileName().GetExtention();
-		oCustomXMLProps.write(OOX::CPath(sCustomXmlPropsDir + FILE_SEPARATOR_STR + sCustomXMLPropsFilename), OOX::CPath(sCustomXmlPropsDir), *m_pDrawingConverter->GetContentTypes());
-
-		std::wstring sCustomXmlFilename;
-		sCustomXmlFilename = OOX::FileTypes::CustomXml.DefaultFileName().GetBasename() + std::to_wstring(m_nCount);
-		sCustomXmlFilename += OOX::FileTypes::CustomXml.DefaultFileName().GetExtention();
-		std::wstring sCustomXmlDir = m_sDir + FILE_SEPARATOR_STR + OOX::FileTypes::CustomXml.DefaultDirectory().GetPath();
-		std::wstring sCustomXmlRelsDir = sCustomXmlDir + FILE_SEPARATOR_STR + L"_rels";
-		NSDirectory::CreateDirectories(sCustomXmlRelsDir);
-
-		m_pDrawingConverter->SetDstContentRels();
-		unsigned int lId;
-		m_pDrawingConverter->WriteRels(OOX::FileTypes::CustomXmlProps.RelationType(), sCustomXMLPropsFilename, L"", &lId);
-		m_pDrawingConverter->SaveDstContentRels(sCustomXmlRelsDir + FILE_SEPARATOR_STR + sCustomXmlFilename + L".rels");
-
-		NSFile::CFileBinary::SaveToFile(sCustomXmlDir + FILE_SEPARATOR_STR + sCustomXmlFilename, sXml);
-		return sCustomXmlFilename;
-	}
-}

ASCOfficeDocxFile2/BinReader/CustormXmlWriter.h

@@ -1,54 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2018
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#ifndef CUSTOM_XML_WRITER
-#define CUSTOM_XML_WRITER
-
-#include "../../XlsxSerializerCom/Common/Common.h"
-
-namespace NSBinPptxRW
-{
-	class CDrawingConverter;
-}
-
-namespace Writers
-{
-	class CustomXmlWriter
-	{
-		int m_nCount;
-        std::wstring				m_sDir;
-		NSBinPptxRW::CDrawingConverter* m_pDrawingConverter;
-	public:
-		CustomXmlWriter(std::wstring sDir, NSBinPptxRW::CDrawingConverter* pDrawingConverter);
-		std::wstring WriteCustomXml(const std::wstring& sUrl, const std::wstring& sXml);
-	};
-}
-#endif	// #ifndef CUSTOM_XML_WRITER

ASCOfficeDocxFile2/BinReader/DocumentWriter.h

@@ -66,13 +66,12 @@ xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawin
 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:w15=\"http://schemas.microsoft.com/office/word/2012/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 w15 wp14\">")));
+mc:Ignorable=\"w14 wp14\">")));
 
                 oFile.WriteStringUTF8(m_oBackground.GetData());
 

ASCOfficeDocxFile2/BinReader/FileWriter.h

@@ -47,7 +47,6 @@
 #include "DocumentRelsWriter.h"
 #include "webSettingsWriter.h"
 #include "DefaultThemeWriter.h"
-#include "CustormXmlWriter.h"
 
 namespace BinDocxRW 
 {
@@ -78,7 +77,6 @@ namespace Writers
 		DocumentRelsWriter		m_oDocumentRelsWriter;
 		WebSettingsWriter		m_oWebSettingsWriter;
 		DefaultThemeWriter		m_oTheme;
-		CustomXmlWriter			m_oCustomXmlWriter;
 		
 		smart_ptr<OOX::VbaProject>		m_pVbaProject;
 	
@@ -104,8 +102,7 @@ namespace Writers
 										m_oDocumentRelsWriter	(sDirOutput),
 										m_oWebSettingsWriter	(sDirOutput),
 										m_nDocPrIndex(0),
-										m_pComments(NULL),
-										m_oCustomXmlWriter		(sDirOutput, pDrawingConverter)
+										m_pComments(NULL)
 		{
 		}
 		int getNextDocPr()

ASCOfficeDocxFile2/BinReader/HeaderFooterWriter.h

@@ -72,13 +72,12 @@ xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawin
 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:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" \
 xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" \
 xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" \
 xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
 xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
 xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" \
-mc:Ignorable=\"w14 w15 wp14\">");
+mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_hdr_End = _T("</w:hdr>");
 
     static  std::wstring g_string_ftr_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
@@ -93,19 +92,18 @@ xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawin
 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:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" \
 xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" \
 xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" \
 xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
 xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
 xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" \
-mc:Ignorable=\"w14 w15 wp14\">");
+mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_ftr_End = _T("</w:ftr>");
 
-	static  std::wstring g_string_footnotes_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:footnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" mc:Ignorable=\"w14 w15 wp14\">");
+    static  std::wstring g_string_footnotes_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:footnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_footnotes_End = _T("</w:footnotes>");
 
-	static  std::wstring g_string_endnotes_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:endnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" mc:Ignorable=\"w14 w15 wp14\">");
+    static  std::wstring g_string_endnotes_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:endnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_endnotes_End = _T("</w:endnotes>");
 
 	class HeaderFooterWriter 

ASCOfficeDocxFile2/BinReader/NumberingWriter.h

@@ -36,7 +36,7 @@
 
 namespace Writers
 {
-	static  std::wstring g_string_n_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:numbering 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:w15=\"http://schemas.microsoft.com/office/word/2012/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 w15 wp14\">");
+    static  std::wstring g_string_n_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:numbering xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_n_End = _T("</w:numbering>");
 
 	class NumberingWriter

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -2115,7 +2115,7 @@ class CDrawingProperty
 public:
 	bool			bObject;
     std::wstring	sObjectProgram;	
-    unsigned int	nObjectId;
+    long			nObjectId;
     BYTE			nObjectType;
 	
 	long    DataPos;
@@ -2800,51 +2800,30 @@ public:
 	}
 	void Write(NSStringUtils::CStringBuilder& wr)
 	{
-		wr.WriteString(L"<w:hyperlink");
-		if(!rId.empty())
+        if(false == rId.empty())
 		{
-			wr.WriteString(L" r:id=\"");
-			wr.WriteEncodeXmlString(rId);
-			wr.WriteString(L"\"");
-		}
-		if(!sTooltip.empty())
-		{
-			wr.WriteString(L" w:tooltip=\"");
-			wr.WriteEncodeXmlString(sTooltip);
-			wr.WriteString(L"\"");
-		}
-		if(!sAnchor.empty())
-		{
-			wr.WriteString(L" w:anchor=\"");
-			wr.WriteEncodeXmlString(sAnchor);
-			wr.WriteString(L"\"");
-		}
-		if (bHistory)
-		{
-			if (History)
+            std::wstring sCorrect_rId       = XmlUtils::EncodeXmlString(rId);
+            std::wstring sCorrect_tooltip   = XmlUtils::EncodeXmlString(sTooltip);
+            std::wstring sCorrect_anchor    = XmlUtils::EncodeXmlString(sAnchor);
+
+            std::wstring sStart = L"<w:hyperlink r:id=\"" + sCorrect_rId + L"\"";
+            if(false == sTooltip.empty())
 			{
-				wr.WriteString(L" w:history=\"1\"");
+                sStart += L" w:tooltip=\"";
+                sStart += sCorrect_tooltip;
+                sStart += L"\"";
 			}
-			else
+            if(false == sAnchor.empty())
 			{
-				wr.WriteString(L" w:history=\"0\"");
+                sStart += L" w:anchor=\"";
+                sStart += sCorrect_anchor;
+                sStart += L"\"";
 			}
+            sStart += L" w:history=\"1\">";
+			wr.WriteString(sStart);
+			wr.Write(writer);
+            wr.WriteString(L"</w:hyperlink>");
 		}
-		if (!sDocLocation.empty())
-		{
-			wr.WriteString(L" w:docLocation=\"");
-			wr.WriteEncodeXmlString(sDocLocation);
-			wr.WriteString(L"\"");
-		}
-		if (!sTgtFrame.empty())
-		{
-			wr.WriteString(L" w:tgtFrame=\"");
-			wr.WriteEncodeXmlString(sTgtFrame);
-			wr.WriteString(L"\"");
-		}
-		wr.WriteString(L">");
-		wr.Write(writer);
-		wr.WriteString(L"</w:hyperlink>");
 	}
 };
 class CFldSimple{

ASCOfficeDocxFile2/BinReader/Readers.cpp

@@ -34,41 +34,6 @@
 
 namespace BinDocxRW {
 
-void InnerColorToOOX(rPr& oRPr, ComplexTypes::Word::CColor& oColor)
-{
-	if (oRPr.bColor)
-	{
-		oColor.m_oVal.Init();
-		oColor.m_oVal->SetValue(SimpleTypes::hexcolorRGB);
-		oColor.m_oVal->Set_R(oRPr.Color.R);
-		oColor.m_oVal->Set_G(oRPr.Color.G);
-		oColor.m_oVal->Set_B(oRPr.Color.B);
-	}
-	if (oRPr.bThemeColor && oRPr.ThemeColor.IsNoEmpty())
-	{
-		if(oRPr.ThemeColor.Auto && !oRPr.bColor)
-		{
-			oColor.m_oVal.Init();
-			oColor.m_oVal->SetValue(SimpleTypes::hexcolorAuto);
-		}
-		if(oRPr.ThemeColor.bColor)
-		{
-			oColor.m_oThemeColor.Init();
-			oColor.m_oThemeColor->SetValue((SimpleTypes::EThemeColor)oRPr.ThemeColor.Color);
-		}
-		if(oRPr.ThemeColor.bTint)
-		{
-			oColor.m_oThemeTint.Init();
-			oColor.m_oThemeTint->SetValue(oRPr.ThemeColor.Tint);
-		}
-		if(oRPr.ThemeColor.bShade)
-		{
-			oColor.m_oThemeShade.Init();
-			oColor.m_oThemeShade->SetValue(oRPr.ThemeColor.Shade);
-		}
-	}
-}
-
 int Binary_VbaProjectTableReader::Read()
 {
 	m_oFileWriter.m_pVbaProject = new OOX::VbaProject(NULL);

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -100,9 +100,10 @@ public:
 		RELEASEOBJECT(m_oRPr)
 	}
 };
+
 #define READ1_DEF(stLen, res, fReadFunction, arg) {\
 	long read1defCurPos = 0;\
-		while(read1defCurPos < (long)stLen)\
+	while(read1defCurPos < stLen)\
 	{\
 		BYTE read1defType = m_oBufferedStream.GetUChar();\
 		long read1defLength =  m_oBufferedStream.GetLong();\
@@ -119,7 +120,7 @@ public:
 }
 #define READ2_DEF(stLen, res, fReadFunction, arg) {\
 	long read2defCurPos = 0;\
-		while(read2defCurPos < (long)stLen)\
+	while(read2defCurPos < stLen)\
 	{\
 		BYTE read2defType = m_oBufferedStream.GetUChar();\
 		long read2defLenType =  m_oBufferedStream.GetUChar();\
@@ -181,8 +182,6 @@ public:
         poResult->UserId = m_oBufferedStream.GetString3(length);\
     }
 
-	void InnerColorToOOX(rPr& oRPr, ComplexTypes::Word::CColor& oColor);
-
 	class Binary_CommonReader
 	{
 	protected:
@@ -2055,7 +2054,7 @@ public:
 			if(true == orowPrAfterBefore.bGridAfter && orowPrAfterBefore.nGridAfter > 0 && false == orowPrAfterBefore.oAfterWidth.bW)
 			{
 				//ищем по tblGrid
-				if(orowPrAfterBefore.nGridAfter < (long)m_aCurTblGrid.size())
+				if(orowPrAfterBefore.nGridAfter < m_aCurTblGrid.size())
 				{
 					double nSumW = 0;
 					for(int i = 0; i < orowPrAfterBefore.nGridAfter; i++)
@@ -2250,15 +2249,6 @@ public:
             case vmerge_Continue:pCStringWriter->WriteString(std::wstring(_T("<w:vMerge w:val=\"continue\" />")));break;
 			}
 		}
-		else if( c_oSerProp_cellPrType::HMerge == type )
-		{
-			BYTE HMerge = m_oBufferedStream.GetUChar();
-			switch(HMerge)
-			{
-			case vmerge_Restart:pCStringWriter->WriteString(std::wstring(_T("<w:hMerge w:val=\"restart\" />")));break;
-			case vmerge_Continue:pCStringWriter->WriteString(std::wstring(_T("<w:hMerge w:val=\"continue\" />")));break;
-			}
-		}
 		else if( c_oSerProp_cellPrType::CellDel == type )
 		{
 			TrackRevision Del;
@@ -2597,7 +2587,7 @@ public:
 		if ( c_oSerNumTypes::Lvl == type )
 		{
 			docLvl* odocLvl = new docLvl();
-			odocLvl->ILvl = (long)odocANum->Lvls.size();
+			odocLvl->ILvl = odocANum->Lvls.size();
 			READ2_DEF(length, res, this->ReadLevel, odocLvl);
 			odocANum->Lvls.push_back(odocLvl);
 		}
@@ -2831,8 +2821,7 @@ public:
 		}
 		else if(c_oSer_sts::Style_Default == type)
 		{
-			odocStyle->bDefault = true;
-			odocStyle->Default = m_oBufferedStream.GetBool();
+			odocStyle->bDefault = (0 != m_oBufferedStream.GetUChar());
 		}
 		else if(c_oSer_sts::Style_BasedOn == type)
 		{
@@ -3231,13 +3220,11 @@ public:
 class Binary_SettingsTableReader : public Binary_CommonReader
 {
 	Binary_pPrReader m_oBinary_pPrReader;
-	Binary_rPrReader m_oBinary_rPrReader;
 	Writers::SettingWriter& m_oSettingWriter;
 	Writers::FileWriter& m_oFileWriter;
-	OOX::CSettingsCustom& m_oSettingsCustom;
 public:
-	Binary_SettingsTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, OOX::CSettingsCustom& oSettingsCustom):
-		Binary_CommonReader(poBufferedStream),m_oSettingWriter(oFileWriter.m_oSettingWriter),m_oFileWriter(oFileWriter),m_oBinary_pPrReader(poBufferedStream, oFileWriter),m_oBinary_rPrReader(poBufferedStream, oFileWriter),m_oSettingsCustom(oSettingsCustom)
+	Binary_SettingsTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter):
+		Binary_CommonReader(poBufferedStream),m_oSettingWriter(oFileWriter.m_oSettingWriter),m_oFileWriter(oFileWriter),m_oBinary_pPrReader(poBufferedStream, oFileWriter)
 	{
 	}
 	int Read()
@@ -3329,18 +3316,6 @@ public:
 			READ1_DEF(length, res, this->ReadEndnotePr, &oEdnProps);
 			m_oFileWriter.m_oSettingWriter.AddSetting(oEdnProps.toXML());
 		}
-		else if( c_oSer_SettingsType::SdtGlobalColor == type )
-		{
-			rPr oRPr(m_oFileWriter.m_oFontTableWriter.m_mapFonts);
-			res = m_oBinary_rPrReader.Read(length, &oRPr);
-			m_oSettingsCustom.m_oSdtGlobalColor.Init();
-			InnerColorToOOX(oRPr, m_oSettingsCustom.m_oSdtGlobalColor.get2());
-		}
-		else if( c_oSer_SettingsType::SdtGlobalShowHighlight == type )
-		{
-			m_oSettingsCustom.m_oSdtGlobalShowHighlight.Init();
-			m_oSettingsCustom.m_oSdtGlobalShowHighlight->m_oVal.FromBool(m_oBufferedStream.GetBool());
-		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -3893,7 +3868,7 @@ public:
 			oFile.WriteFile(pData, length);
 			oFile.CloseFile();
 
-			unsigned int lId = 0;
+			long lId;
 			m_oFileWriter.m_pDrawingConverter->WriteRels(OOX::FileTypes::JsaProject.RelationType(), sJsaProject.GetPath(), L"", &lId);
 			m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_pContentTypes->AddDefault(sJsaProject.GetExtention(false));
 		}
@@ -3970,12 +3945,6 @@ public:
 			READ1_DEF(length, res, this->ReadMathArg, poResult);
             m_oDocumentWriter.m_oContent.WriteString(std::wstring(_T("</m:oMath>")));
 		}
-		else if ( c_oSerParType::MRun == type )
-		{
-			GetRunStringWriter().WriteString(std::wstring(_T("<m:r>")));
-			READ1_DEF(length, res, this->ReadMathMRun, poResult);
-			GetRunStringWriter().WriteString(std::wstring(_T("</m:r>")));
-		}
 		else if ( c_oSerParType::Hyperlink == type )
 		{
 			CHyperlink oHyperlink;
@@ -4524,13 +4493,11 @@ public:
 			NSStringUtils::CStringBuilder* pPrevWriter = m_pCurWriter;
 			m_pCurWriter = &pHyperlink->writer;
 			READ1_DEF(length, res, this->ReadParagraphContent, NULL);
-			if (!pHyperlink->sLink.empty())
-			{
-				unsigned int rId;
-				std::wstring sHref = XmlUtils::EncodeXmlString(pHyperlink->sLink);
-				m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink")), sHref, std::wstring(_T("External")), &rId);
-				pHyperlink->rId = L"rId" + std::to_wstring(rId);
-			}
+			long rId;
+            std::wstring sHref = XmlUtils::EncodeXmlString(pHyperlink->sLink);
+            m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink")), sHref, std::wstring(_T("External")), &rId);
+
+            pHyperlink->rId = L"rId" + std::to_wstring(rId);
 			m_pCurWriter = pPrevWriter;
 		}
 		else
@@ -4598,12 +4565,6 @@ public:
 			READ1_DEF(length, res, this->ReadMathDelimiter, poResult);
             GetRunStringWriter().WriteString(std::wstring(_T("</m:d>")));
 		}
-		else if ( c_oSer_OMathContentType::Del == type )
-		{
-			TrackRevision oTrackRevision;
-			READ1_DEF(length, res, this->ReadDelIns, &oTrackRevision);
-			oTrackRevision.Write(&GetRunStringWriter(), _T("w:del"));
-		}
 		else if ( c_oSer_OMathContentType::EqArr == type )
 		{			
             GetRunStringWriter().WriteString(std::wstring(_T("<m:eqArr>")));
@@ -4628,12 +4589,6 @@ public:
 			READ1_DEF(length, res, this->ReadMathGroupChr, poResult);
             GetRunStringWriter().WriteString(std::wstring(_T("</m:groupChr>")));
 		}
-		else if ( c_oSer_OMathContentType::Ins == type )
-		{
-			TrackRevision oTrackRevision;
-			READ1_DEF(length, res, this->ReadDelIns, &oTrackRevision);
-			oTrackRevision.Write(&GetRunStringWriter(), _T("w:ins"));
-		}
 		else if ( c_oSer_OMathContentType::LimLow == type )
 		{			
             GetRunStringWriter().WriteString(std::wstring(_T("<m:limLow>")));
@@ -6889,7 +6844,7 @@ public:
                 std::wstring sNewImgRel = _T("media/") + sNewImgName;
 
                 sNewImgRel = XmlUtils::EncodeXmlString(sNewImgRel);
-				unsigned int rId;
+				long rId;
                 m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/image")), sNewImgRel, std::wstring(), &rId);
                 odocImg.srId = L"rId" + std::to_wstring(rId);
 				//odocImg.srId = m_oMediaWriter.m_poDocumentRelsWriter->AddRels(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"), sNewImgRel, false);
@@ -7430,7 +7385,7 @@ public:
 				if (oXlsxSerializer.writeChartXlsx(sXlsxPath, *pChartSpace))
 				{
 					std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
-					unsigned int rIdXlsx;
+					long rIdXlsx;
 					std::wstring bstrChartsWorksheetRelType = OOX::FileTypes::MicrosoftOfficeExcelWorksheet.RelationType();
 
 					m_oFileWriter.m_pDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &rIdXlsx);
@@ -7457,7 +7412,7 @@ public:
                 OOX::CPath pathChartsRels =  pathChartsRelsDir.GetPath() + FILE_SEPARATOR_STR + sFilename + L".rels";
 				m_oFileWriter.m_pDrawingConverter->SaveDstContentRels(pathChartsRels.GetPath());
 
-				unsigned int rIdChart;
+				long rIdChart;
                 std::wstring bstrChartRelType = OOX::FileTypes::Chart.RelationType();
 				
 				m_oFileWriter.m_pDrawingConverter->WriteRels(bstrChartRelType, sRelsName, std::wstring(), &rIdChart);
@@ -8047,24 +8002,11 @@ public:
 			pSdtPr->m_oAlias->m_sVal.Init();
 			pSdtPr->m_oAlias->m_sVal->append(m_oBufferedStream.GetString3(length));
 		}
-		else if (c_oSerSdt::Appearance == type)
-		{
-			pSdtPr->m_oAppearance.Init();
-			pSdtPr->m_oAppearance->m_oVal.Init();
-			pSdtPr->m_oAppearance->m_oVal->SetValue((SimpleTypes::ESdtAppearance)m_oBufferedStream.GetUChar());
-		}
 		else if (c_oSerSdt::ComboBox == type)
 		{
 			pSdtPr->m_oComboBox.Init();
 			READ1_DEF(length, res, this->ReadSdtComboBox, pSdtPr->m_oComboBox.GetPointer());
 		}
-		else if (c_oSerSdt::Color == type)
-		{
-			rPr oRPr(m_oFileWriter.m_oFontTableWriter.m_mapFonts);
-			res = oBinary_rPrReader.Read(length, &oRPr);
-			pSdtPr->m_oColor.Init();
-			InnerColorToOOX(oRPr, pSdtPr->m_oColor.get2());
-		}
 		else if (c_oSerSdt::DataBinding == type)
 		{
 			pSdtPr->m_oDataBinding.Init();
@@ -8480,12 +8422,11 @@ public:
 				if(c_oSerConstants::ReadOk != res)
 					return res;
 			}
-			OOX::CSettingsCustom oSettingsCustom;
 			if(-1 != nSettingsOffset)
 			{
 				int nOldPos = m_oBufferedStream.GetPos();
 				m_oBufferedStream.Seek(nSettingsOffset);
-				res = Binary_SettingsTableReader(m_oBufferedStream, m_oFileWriter, oSettingsCustom).Read();
+				res = Binary_SettingsTableReader(m_oBufferedStream, m_oFileWriter).Read();
 				if(c_oSerConstants::ReadOk != res)
 					return res;
 			}
@@ -8564,7 +8505,7 @@ public:
 				m_oBufferedStream.Seek(nDocumentOffset);
 
 				m_oFileWriter.m_pDrawingConverter->SetDstContentRels();
-				unsigned int stamdartRId;
+				long stamdartRId;
                
 				m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles",		L"styles.xml",		L"", &stamdartRId);
                 m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings",	L"settings.xml",	L"", &stamdartRId);
@@ -8592,19 +8533,19 @@ public:
 
 				if(false == m_oFileWriter.m_oNumberingWriter.IsEmpty())
 				{
-					unsigned int rId;
+					long 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())
 				{
-					unsigned int rId;
+					long 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())
 				{
-					unsigned int rId;
+					long 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");
 				}
@@ -8613,7 +8554,7 @@ public:
 					Writers::HdrFtrItem* pHeader = m_oFileWriter.m_oHeaderFooterWriter.m_aHeaders[i];
 					if(false == pHeader->IsEmpty())
 					{
-						unsigned int rId;
+						long 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 );
 						
@@ -8625,20 +8566,13 @@ public:
 					Writers::HdrFtrItem* pFooter = m_oFileWriter.m_oHeaderFooterWriter.m_aFooters[i];
 					if(false == pFooter->IsEmpty())
 					{
-						unsigned int rId;
+						long 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);
 					}
 				}
-				if(!oSettingsCustom.IsEmpty()){
-					std::wstring sFilename = m_oFileWriter.m_oCustomXmlWriter.WriteCustomXml(oSettingsCustom.GetSchemaUrl(), oSettingsCustom.ToXml());
-					std::wstring sRelsPath = L"../" + OOX::FileTypes::CustomXml.DefaultDirectory().GetPath() + L"/" + sFilename;
-					unsigned int rId;
-					m_oFileWriter.m_pDrawingConverter->WriteRels(OOX::FileTypes::CustomXml.RelationType(), sRelsPath, L"", &rId);
-				}
-
 				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 + L"word"
@@ -8656,19 +8590,19 @@ public:
                 
 				if(false == oCommentsWriter.m_sComment.empty())
 				{
-					unsigned int rId;
+					long 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())
 				{
-					unsigned int rId;
+					long 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())
 				{
-					unsigned int rId;
+					long rId;
                     m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.microsoft.com/office/2011/relationships/people", L"people.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.people+xml", L"/word", L"people.xml");
 				}

ASCOfficeDocxFile2/BinReader/fontTableWriter.h

@@ -38,7 +38,7 @@
 
 namespace Writers
 {
-	static std::wstring g_string_ft_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:fonts xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" mc:Ignorable=\"w14 w15\">");
+    static std::wstring g_string_ft_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:fonts xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" mc:Ignorable=\"w14\">");
     static std::wstring g_string_ft_End = _T("</w:fonts>");
 
 	class FontTableWriter

ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h

@@ -1438,8 +1438,8 @@ namespace MathEquation
 				}
 				else if (eType == commandBrackets)
 				{
-					MBRACKETSTYPE ebType = MBRACKETSTYPE::bracketsAngle; //???
-					EndBrackets(ebType, false, false);
+					MBRACKETSTYPE ebType;
+					EndBrackets(ebType, false,false);
 				}
 			}
 			virtual void BeginAngleBracketsWithSeparator(MANGLEBRACKETSWITHSEPARATORTYPE eType)

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -445,8 +445,7 @@ extern int g_nCurFormatVersion;
 		textDirection = 11,
 		hideMark = 12,
 		noWrap = 13,
-		tcFitText = 14,
-		HMerge = 15
+		tcFitText = 14
 	};}
 	namespace c_oSerProp_secPrType{enum c_oSerProp_secPrType
 	{
@@ -499,8 +498,8 @@ extern int g_nCurFormatVersion;
 		MoveToRangeEnd = 21,
 		JsaProject = 22,
 		BookmarkStart = 23,
-		BookmarkEnd = 24,
-		MRun = 25
+		BookmarkEnd = 24
+
 	};}
 	namespace c_oSerDocTableType{enum c_oSerDocTableType
 	{
@@ -762,10 +761,7 @@ extern int g_nCurFormatVersion;
 		MathPr = 2,
 		TrackRevisions = 3,
 		FootnotePr = 4,
-		EndnotePr = 5,
-		SdtGlobalColor = 6,
-		SdtGlobalShowHighlight = 7,
-		Compat = 8
+		EndnotePr = 5
 	};}
 	namespace c_oSer_MathPrType{enum c_oSer_SettingsType
 	{
@@ -1100,9 +1096,7 @@ extern int g_nCurFormatVersion;
 		TabIndex = 32,
 		Tag = 33,
 		Temporary = 34,
-		MultiLine = 35,
-		Appearance = 36,
-		Color = 37
+		MultiLine = 35
 	};}
 	namespace c_oSerFFData{enum c_oSerFFData
 	{
@@ -1151,13 +1145,6 @@ extern int g_nCurFormatVersion;
 		ColFirst = 3,
 		ColLast = 4
 	};}
-	namespace c_oSerCompat{enum c_oSerCompat
-	{
-		CompatSetting = 0,
-		CompatName = 1,
-		CompatUri = 2,
-		CompatValue = 3
-	};}
 }
 
 #endif	// #ifndef DOCX_BIN_READER_WRITER_DEFINES

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -61,7 +61,6 @@
 #include "../../Common/DocxFormat/Source/DocxFormat/Media/JsaProject.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/HeaderFooter.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/App.h"
-#include "../../Common/DocxFormat/Source/DocxFormat/CustomXml.h"
 
 namespace BinDocxRW
 {
@@ -2266,24 +2265,6 @@ namespace BinDocxRW
 						m_oBcw.m_oStream.WriteBYTE(vmerge_Continue);
 					}
 				}
-				if(cellPr->m_oHMerge.IsInit())
-				{
-					m_oBcw.m_oStream.WriteBYTE(c_oSerProp_cellPrType::HMerge);
-					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-					if(cellPr->m_oHMerge->m_oVal.IsInit())
-					{
-						switch(cellPr->m_oHMerge->m_oVal->GetValue())
-						{
-						case SimpleTypes::mergeContinue: m_oBcw.m_oStream.WriteBYTE(vmerge_Continue); break;
-						case SimpleTypes::mergeRestart: m_oBcw.m_oStream.WriteBYTE(vmerge_Restart); break;
-						default: m_oBcw.m_oStream.WriteBYTE(vmerge_Continue);break;
-						}
-					}
-					else
-					{
-						m_oBcw.m_oStream.WriteBYTE(vmerge_Continue);
-					}
-				}
 				if(cellPr->m_oCellDel.IsInit())
 				{
 					m_oBcw.m_oStream.WriteBYTE(c_oSerProp_cellPrType::CellDel);
@@ -3505,14 +3486,6 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
-				case OOX::et_m_r:
-					{
-						OOX::Logic::CMRun* pMRun = static_cast<OOX::Logic::CMRun*>(item);
-						nCurPos = m_oBcw.WriteItemStart(c_oSerParType::MRun);
-						WriteMathRunContent(pMRun);
-						m_oBcw.WriteItemEnd(nCurPos);
-						break;
-					}
 				default:
 					break;
 				}
@@ -4122,14 +4095,6 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
-				case OOX::et_w_del:
-					{
-						OOX::Logic::CDel* pDel = static_cast<OOX::Logic::CDel*>(item);
-						nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathContentType::Del);
-						WriteDel(*pDel);
-						m_oBcw.WriteItemEnd(nCurPos);
-						break;
-					}
 				case OOX::et_m_eqArr:
 					{
 						OOX::Logic::CEqArr* pEqArr = static_cast<OOX::Logic::CEqArr*>(item);
@@ -4182,14 +4147,6 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
-				case OOX::et_w_ins:
-					{
-						OOX::Logic::CIns* pIns = static_cast<OOX::Logic::CIns*>(item);
-						nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathContentType::Ins);
-						WriteIns(*pIns);
-						m_oBcw.WriteItemEnd(nCurPos);
-						break;
-					}
 				case OOX::et_m_limLow:
 					{
 						OOX::Logic::CLimLow* pLimLow = static_cast<OOX::Logic::CLimLow*>(item);
@@ -7117,27 +7074,12 @@ namespace BinDocxRW
 				m_oBcw.m_oStream.WriteStringW3(oStdPr.m_oAlias->m_sVal.get());
 				m_oBcw.WriteItemEnd(nCurPos);
 			}
-			if(oStdPr.m_oAppearance.IsInit() && oStdPr.m_oAppearance->m_oVal.IsInit())
-			{
-				nCurPos = m_oBcw.WriteItemStart(c_oSerSdt::Appearance);
-				m_oBcw.m_oStream.WriteBYTE(oStdPr.m_oAppearance->m_oVal->GetValue());
-				m_oBcw.WriteItemEnd(nCurPos);
-			}
 			if(oStdPr.m_oComboBox.IsInit())
 			{
 				nCurPos = m_oBcw.WriteItemStart(c_oSerSdt::ComboBox);
 				WriteSdtComboBox(oStdPr.m_oComboBox.get());
 				m_oBcw.WriteItemEnd(nCurPos);
 			}
-			if(oStdPr.m_oColor.IsInit())
-			{
-				nCurPos = m_oBcw.WriteItemStart(c_oSerSdt::Color);
-				if(oStdPr.m_oColor->m_oVal.IsInit())
-					m_oBcw.WriteColor(c_oSerProp_rPrType::Color, oStdPr.m_oColor->m_oVal.get());
-
-				m_oBcw.WriteThemeColor(c_oSerProp_rPrType::ColorTheme, oStdPr.m_oColor->m_oVal, oStdPr.m_oColor->m_oThemeColor, oStdPr.m_oColor->m_oThemeTint, oStdPr.m_oColor->m_oThemeShade);
-				m_oBcw.WriteItemEnd(nCurPos);
-			}
 			if(oStdPr.m_oDataBinding.IsInit())
 			{
 				nCurPos = m_oBcw.WriteItemStart(c_oSerSdt::DataBinding);
@@ -7535,18 +7477,17 @@ namespace BinDocxRW
 	{
 		BinaryCommonWriter m_oBcw;
 		Binary_pPrWriter bpPrs;
-		Binary_rPrWriter brPrs;
 	public:
-		BinarySettingsTableWriter(ParamsWriter& oParamsWriter):m_oBcw(oParamsWriter),bpPrs(oParamsWriter, NULL), brPrs(oParamsWriter)
+		BinarySettingsTableWriter(ParamsWriter& oParamsWriter):m_oBcw(oParamsWriter),bpPrs(oParamsWriter, NULL)
 		{
 		};
-		void Write(OOX::CSettings& oSettings, OOX::CSettingsCustom& oSettingsCustom)
+		void Write(OOX::CSettings& oSettings)
 		{
 			int nStart = m_oBcw.WriteItemWithLengthStart();
-			WriteSettingsContent(oSettings, oSettingsCustom);
+			WriteSettingsContent(oSettings);
 			m_oBcw.WriteItemWithLengthEnd(nStart);
 		}
-		void WriteSettingsContent(OOX::CSettings& oSettings, OOX::CSettingsCustom& oSettingsCustom)
+		void WriteSettingsContent(OOX::CSettings& oSettings)
 		{
 			int nCurPos = 0;
 			if(oSettings.m_oClrSchemeMapping.IsInit())
@@ -7587,26 +7528,6 @@ namespace BinDocxRW
 								  NULL, &oSettings.m_oEndnotePr->m_oPos, &oSettings.m_oEndnotePr->m_arrEndnote);
 				m_oBcw.WriteItemEnd(nCurPos);
 			}
-			if(oSettings.m_oCompat.IsInit())
-			{
-				nCurPos = m_oBcw.WriteItemStart(c_oSer_SettingsType::Compat);
-				WriteCompat(oSettings.m_oCompat.get());
-				m_oBcw.WriteItemEnd(nCurPos);
-			}
-			if(oSettingsCustom.m_oSdtGlobalColor.IsInit())
-			{
-				nCurPos = m_oBcw.WriteItemStart(c_oSer_SettingsType::SdtGlobalColor);
-				OOX::Logic::CRunProperty oRPr;
-				oRPr.m_oColor = oSettingsCustom.m_oSdtGlobalColor;
-				brPrs.Write_rPr(&oRPr);
-				m_oBcw.WriteItemEnd(nCurPos);
-			}
-			if(oSettingsCustom.m_oSdtGlobalShowHighlight.IsInit())
-			{
-				nCurPos = m_oBcw.WriteItemStart(c_oSer_SettingsType::SdtGlobalShowHighlight);
-				m_oBcw.m_oStream.WriteBOOL(oSettingsCustom.m_oSdtGlobalShowHighlight->m_oVal.ToBool());
-				m_oBcw.WriteItemEnd(nCurPos);
-			}
 		};
 		void WriteMathPr(const OOX::Logic::CMathPr &pMathPr)
 		{
@@ -7922,38 +7843,6 @@ namespace BinDocxRW
 				m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
 			}
 		};
-		void WriteCompat(const OOX::Settings::CCompat& oCompat)
-		{
-			int nCurPos = 0;
-			for(size_t i = 0; i < oCompat.m_arrCompatSettings.size(); ++i)
-			{
-				nCurPos = m_oBcw.WriteItemStart(c_oSerCompat::CompatSetting);
-				WriteCompatSetting(*oCompat.m_arrCompatSettings[i]);
-				m_oBcw.WriteItemEnd(nCurPos);
-			}
-		}
-		void WriteCompatSetting(const OOX::Settings::CCompatSetting& oCompatSetting)
-		{
-			int nCurPos = 0;
-			if(oCompatSetting.m_sName.IsInit())
-			{
-				nCurPos = m_oBcw.WriteItemStart	(c_oSerCompat::CompatName);
-				m_oBcw.m_oStream.WriteStringW3(oCompatSetting.m_sName.get());
-				m_oBcw.WriteItemEnd(nCurPos);
-			}
-			if(oCompatSetting.m_sUri.IsInit())
-			{
-				nCurPos = m_oBcw.WriteItemStart	(c_oSerCompat::CompatUri);
-				m_oBcw.m_oStream.WriteStringW3(oCompatSetting.m_sUri.get());
-				m_oBcw.WriteItemEnd(nCurPos);
-			}
-			if(oCompatSetting.m_sVal.IsInit())
-			{
-				nCurPos = m_oBcw.WriteItemStart	(c_oSerCompat::CompatValue);
-				m_oBcw.m_oStream.WriteStringW3(oCompatSetting.m_sVal.get());
-				m_oBcw.WriteItemEnd(nCurPos);
-			}
-		}
 	};
 	class BinaryNotesTableWriter
 	{
@@ -8150,16 +8039,9 @@ namespace BinDocxRW
 		//Write Settings
 				if(NULL != oDocx.m_pSettings)
 				{
-					std::wstring sSettings = oDocx.GetCustomSettings();
-					OOX::CSettingsCustom oSettingsCustom;
-					if(!sSettings.empty())
-					{
-						oSettingsCustom.FromXml(sSettings);
-					}
-
 					BinDocxRW::BinarySettingsTableWriter oBinarySettingsTableWriter(m_oParamsWriter);
 					int nCurPos = this->WriteTableStart(BinDocxRW::c_oSerTableTypes::Settings);
-					oBinarySettingsTableWriter.Write(*oDocx.m_pSettings, oSettingsCustom);
+					oBinarySettingsTableWriter.Write(*oDocx.m_pSettings);
 					this->WriteTableEnd(nCurPos);
 				}
 

ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp

@@ -282,7 +282,7 @@ namespace BinXlsxRW{
 			{
 				OOX::Spreadsheet::CTableColumn* pTableColumn = new OOX::Spreadsheet::CTableColumn();
 				pTableColumn->m_oId.Init();
-				pTableColumn->m_oId->SetValue((unsigned int)i + 1);
+				pTableColumn->m_oId->SetValue(i + 1);
 				pTableColumn->m_oName.Init();
 				pTableColumn->m_oName->append(m_aTableNames[i]);
 				pTable->m_oTable->m_oTableColumns->m_arrItems.push_back(pTableColumn);
@@ -604,7 +604,7 @@ namespace BinXlsxRW{
 							// Не число
 							aSharedStrings.push_back(val);
 							pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeSharedString);
-							pCell->m_oValue->m_sText = std::to_wstring((int)aSharedStrings.size() - 1);
+							pCell->m_oValue->m_sText = std::to_wstring(aSharedStrings.size() - 1);
 						}
 						else
 						{
@@ -658,7 +658,7 @@ namespace BinXlsxRW{
 
         if(NULL != format)
 		{
-			int nXfsIndex = (int)m_aXfs.size();
+			int nXfsIndex = m_aXfs.size();
 
             boost::unordered_map<std::wstring, int>::const_iterator itFormat = m_mapFormats.find(*format);
 			if(itFormat == m_mapFormats.end())

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -34,7 +34,6 @@
 #include "../../DesktopEditor/common/Directory.h"
 #include "../../DesktopEditor/common/File.h"
 #include "../../DesktopEditor/common/Path.h"
-#include "../../DesktopEditor/common/SystemUtils.h"
 #include "../BinWriter/BinWriters.h"
 #include "../BinReader/Readers.h"
 #include "../../ASCOfficePPTXFile/Editor/FontPicker.h"
@@ -196,7 +195,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 		bool bValidFormat = false;
         std::wstring sSignature(g_sFormatSignature);
         int nSigLength = (int)sSignature.length();
-		if((int)nBase64DataSize > nSigLength)
+		if(nBase64DataSize > nSigLength)
 		{
             std::string sCurSig((char*)pBase64Data, nSigLength);
             if(sSignature == std::wstring(sCurSig.begin(), sCurSig.end()))
@@ -299,10 +298,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				OOX::CApp* pApp = new OOX::CApp(NULL);
 				if (pApp)
 				{
-					std::wstring sApplication = NSSystemUtils::GetEnvVariable(NSSystemUtils::gc_EnvApplicationName);
-					if (sApplication.empty())
-						sApplication = NSSystemUtils::gc_EnvApplicationNameDefault;
-					pApp->SetApplication(sApplication);
+					pApp->SetApplication(L"ONLYOFFICE");
 #if defined(INTVER)
                     pApp->SetAppVersion(VALUE2STR(INTVER));
 #endif

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -85,7 +85,7 @@ namespace BinXlsxRW{
 		sMediaPath = pathMediaDir.GetPath();
 		sEmbedPath = pathEmbedDir.GetPath();
 	}
-    _UINT32 CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir)
+    int 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);
 
@@ -100,7 +100,7 @@ namespace BinXlsxRW{
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;		
 		return oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions);
 	}
-    _UINT32 CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)
+    int CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)
 	{
 		COfficeFontPicker* pFontPicker = new COfficeFontPicker();
 		pFontPicker->Init(m_sFontDir);
@@ -136,7 +136,7 @@ namespace BinXlsxRW{
 		oOfficeDrawingConverter.SetFontPicker(pFontPicker);
 
 		BinXlsxRW::BinaryFileWriter oBinaryFileWriter(fp);
-		_UINT32 result = oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions, m_bIsNoBase64);
+		int result = oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions, m_bIsNoBase64);
 
 		RELEASEOBJECT(pFontPicker);
 		return result;
@@ -186,7 +186,7 @@ namespace BinXlsxRW{
 					pReader->m_pRels->m_pManager->m_pContentTypes->AddDefault(L"xlsx");
 
 					std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
-					unsigned int rId;
+					long rId;
 					std::wstring bstrChartsWorksheetRelType = OOX::FileTypes::MicrosoftOfficeExcelWorksheet.RelationType();
 					m_pExternalDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &rId);
 

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h

@@ -33,7 +33,6 @@
 #define XLSX_SERIALIZER
 
 #include <string>
-#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 
 namespace OOX
 {
@@ -63,8 +62,8 @@ namespace BinXlsxRW {
 		
         static void CreateXlsxFolders  (const std::wstring& sXmlOptions, const std::wstring& sDstPath, std::wstring& sMediaPath, std::wstring& sEmbedPath);
 
-        _UINT32 loadFromFile	(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedPath);
-        _UINT32 saveToFile		(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions);
+        int loadFromFile		(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedPath);
+        int saveToFile			(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions);
 		
         bool saveChart          (NSBinPptxRW::CBinaryFileReader* pReader, long lLength, const std::wstring& sFilename, const long& lChartNumber);
 		

ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro

@@ -34,8 +34,7 @@ SOURCES += \
     ../../XlsxSerializerCom/Writer/CSVWriter.cpp \
     ../../OfficeCryptReader/source/ECMACryptFile.cpp \
     ../../OfficeCryptReader/source/CryptTransform.cpp \
-    ../BinReader/Readers.cpp \
-    ../BinReader/CustormXmlWriter.cpp
+    ../BinReader/Readers.cpp
 
 HEADERS += ../DocWrapper/DocxSerializer.h \
     ../DocWrapper/FontProcessor.h \
@@ -70,5 +69,4 @@ HEADERS += ../DocWrapper/DocxSerializer.h \
     ../BinReader/DefaultThemeWriter.h \
     ../DocWrapper/ChartWriter.h \
     ../../OfficeCryptReader/source/ECMACryptFile.h \
-    ../../OfficeCryptReader/source/CryptTransform.h \
-    ../BinReader/CustormXmlWriter.h
+    ../../OfficeCryptReader/source/CryptTransform.h

ASCOfficeOdfFile/formulasconvert/formulasconvert.h

@@ -36,7 +36,6 @@
 #include "../include/CPScopedPtr.h"
 
 namespace cpdoccore {
-
 namespace formulasconvert {
 
 
@@ -45,7 +44,7 @@ namespace formulasconvert {
 class odf2oox_converter
 {
 public:
-	odf2oox_converter();
+    odf2oox_converter();
     ~odf2oox_converter();
 
     // of:=SUM([.DDA1:.BA3]) -> SUM(DDA1:BA3)

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -35,7 +35,6 @@
 #include <boost/algorithm/string.hpp>
 
 #include"../../Common/DocxFormat/Source/XML/Utils.h"
-#include "../src/docx/xlsxconversioncontext.h"
 
 namespace cpdoccore {
 namespace formulasconvert {
@@ -43,9 +42,6 @@ namespace formulasconvert {
 	class odf2oox_converter::Impl
 	{
 	public:
-		Impl() {}
-		
-		static std::unordered_map<std::wstring, int> & mapExternalLink_;
 
 		std::wstring convert(const std::wstring& expr);
 		std::wstring convert_chart_distance(const std::wstring& expr);
@@ -55,158 +51,23 @@ namespace formulasconvert {
 		void replace_cells_range(std::wstring& expr, bool withTableName);
 		bool check_formula(std::wstring& expr);
 		void replace_semicolons(std::wstring& expr);
-		void replace_tilda(std::wstring& expr);
 		void replace_vertical(std::wstring& expr);
 		void replace_space(std::wstring& expr);
-	
-		std::wstring convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator);
-		std::wstring convert_named_expr(const std::wstring& expr, bool withTableName);
-		
+
 		static std::wstring replace_named_ref_formater(boost::wsmatch const & what);
 		static std::wstring replace_named_ref_formater1(boost::wsmatch const & what);
-		//static std::wstring replace_cell_range_formater(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_;
-
-//-------------------------------------------------------------------------------------------------------------
-		static std::wstring replace_semicolons_formater(boost::wsmatch const & what)
-		{
-			if (what[1].matched)
-				return L",";
-			else if (what[2].matched)
-				return what[2].str();    
-			else if (what[3].matched)
-				return what[3].str();
-			else
-				return L"";
-		}
-		static std::wstring replace_tilda_formater(boost::wsmatch const & what)
-		{
-			if (what[1].matched)
-				return L";";
-			else if (what[2].matched)
-				return what[2].str();    
-			else if (what[3].matched)
-				return what[3].str();
-			else
-				return L"";
-		}
-		static std::wstring replace_vertical_formater(boost::wsmatch const & what)
-		{
-			if (what[1].matched)
-			{
-				std::wstring inner = what[1].str();
-				XmlUtils::replace_all( inner, L"|", L";");
-				return L"{" + inner + L"}";
-			}    
-			else if (what[2].matched)
-				return what[2].str();
-			else if (what[3].matched)
-				return what[3].str();
-		
-			return L"";
-		}
-
-		static void replace_tmp_back(std::wstring &expr)
-		{
-			XmlUtils::replace_all( expr, L"ТОСHKA", L".");
-			XmlUtils::replace_all( expr, L"VOSKL", L"!");
-
-			XmlUtils::replace_all( expr, L"SCOBCAIN", L"(");
-			XmlUtils::replace_all( expr, L"SCOBCAOUT", L")");
-
-			XmlUtils::replace_all( expr, L"KVADRATIN", L"[");
-			XmlUtils::replace_all( expr, L"KVADRATOUT", L"]");
-			
-			XmlUtils::replace_all( expr, L"PROBEL", L" ");
-			XmlUtils::replace_all( expr, L"APOSTROF", L"'");	
-			XmlUtils::replace_all( expr, L"KAVYCHKA", L"\"");
-		}
-		static void replace_tmp(std::wstring &expr)
-		{
-			XmlUtils::replace_all( expr, L".", L"ТОСHKA");
-			XmlUtils::replace_all( expr, L"!", L"VOSKL");
-
-			XmlUtils::replace_all( expr, L"(", L"SCOBCAIN");
-			XmlUtils::replace_all( expr, L")", L"SCOBCAOUT");
-
-			//XmlUtils::replace_all( expr, L"[", L"KVADRATIN");
-			//XmlUtils::replace_all( expr, L"]", L"KVADRATOUT");
-			
-			XmlUtils::replace_all( expr, L" ", L"PROBEL");
-		//	XmlUtils::replace_all( expr, L"'", L"APOSTROF");	
-		//	XmlUtils::replace_all( expr, L"\"", L"KAVYCHKA");
-		}
-		static std::wstring convert_scobci(boost::wsmatch const & what)
-		{
-			if (what[1].matched)
-			{
-				std::wstring inner = what[1].str();
-
-				replace_tmp(inner);
-
-				return inner;
-			}
-			else if (what[2].matched)
-			{
-				std::wstring inner = what[2].str();
-				
-				replace_tmp(inner);
-
-				return inner;
-			}
-			else if (what[3].matched)
-				return what[3].str();
-		
-			return L"";
-		}
-		static std::wstring replace_space_formater(boost::wsmatch const & what)
-		{
-			if (what[1].matched)
-			{
-				std::wstring inner = what[1].str();
-				XmlUtils::replace_all( inner, L" ", L",");
-				return inner;
-			}    
-			else if (what[2].matched)
-				return what[2].str();
-			else if (what[3].matched)
-				return what[3].str();
-
-			return L"";
-		}
-
-		static std::wstring is_forbidden(const std::wstring & formula)
-		{
-			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, it->first))
-				{
-
-					XmlUtils::replace_all(result, it->first, it->second);
-				}
-			}
-			return result;
-		}
-
-
+		static bool			convert_with_TableName;
+		static std::wstring table_name_;
 	};
 	bool			odf2oox_converter::Impl::convert_with_TableName = true;
 	std::wstring	odf2oox_converter::Impl::table_name_			= L"";
-	
-	std::unordered_map<std::wstring, int> &odf2oox_converter::Impl::mapExternalLink_ = oox::xlsx_conversion_context::mapExternalLink_;
 
 	bool odf2oox_converter::Impl::find_first_last_ref(std::wstring const & expr, std::wstring & table,std::wstring & ref_first,std::wstring & ref_last)
 	{	
@@ -214,14 +75,14 @@ namespace formulasconvert {
 	    
 		boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L".:"), boost::algorithm::token_compress_on);
 	    
-		if (splitted.size() == 3)
+		if (splitted.size()==3)
 		{
 			table		= splitted[0];	
 			ref_first	= splitted[1];
 			ref_last	= splitted[2];
 			return true;
 		}
-		if (splitted.size() == 4)
+		if (splitted.size()==4)
 		{
 			table		= splitted[0];	
 			ref_first	= splitted[1];
@@ -233,7 +94,7 @@ namespace formulasconvert {
 
 	bool odf2oox_converter::Impl::find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref)
 	{
-                boost::wregex re(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.([\\w^0-9\\$]+\\d+)(?::\\.([\\w^0-9]+\\d+)){0,1}\\]");
+		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);
 
@@ -256,92 +117,101 @@ namespace formulasconvert {
 	}
 
 	
-	//std::wstring odf2oox_converter::Impl::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"");
+	std::wstring odf2oox_converter::Impl::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(); 
-	//		std::wstring c2 = what[3].str(); 
-	//		if (c2.empty()) c2 = what[4].str(); 
-	//		const std::wstring s =  sheet1 + L"!" + c1 + (c2.empty() ? L"" : (L":" + c2) );
-	//		return s;
-	//	}
-	//	return L"";
-	//}
+			const std::wstring c1 = what[2].str(); 
+			std::wstring c2 = what[3].str(); 
+			if (c2.empty()) c2 = what[4].str(); 
+			const std::wstring s =  sheet1 + L"!" + c1 + (c2.empty() ? L"" : (L":" + c2) );
+			return s;
+		}
+		return L"";
+	}
 
 	std::wstring odf2oox_converter::Impl::replace_named_ref_formater(boost::wsmatch const & what)
 	{
 		const size_t sz = what.size();
 
-		if (sz < 6) return what[0].str();
-
-		std::wstring c0			= what[0].str(); 
-		std::wstring external	= sz == 7 ? what[1].matched ? what[1].str() : what[2].str() : what[1].str();
-		std::wstring sheet1		= sz == 7 ? what[3].str() : what[2].str();
-		std::wstring ref1		= sz == 7 ? what[4].str() : what[3].str();
-		std::wstring sheet2		= sz == 7 ? what[5].str() : what[4].str();
-		std::wstring ref2		= sz == 7 ? what[6].str() : what[5].str();
-		
-		XmlUtils::replace_all( sheet1, L"$", L"");
-		//XmlUtils::replace_all( sheet2, L"$", L"");
-
-		std::wstring result;
-
-		if (false == external.empty())
+		if (sz == 4 && !what[1].matched)
 		{
-			replace_tmp_back(external);
+			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"");
 
-			int id = -1;//add_external_link(external);
-			std::unordered_map<std::wstring, int>::iterator pFind = mapExternalLink_.find(external);
-			if ( pFind == mapExternalLink_.end())
+			table_name_ = sheet1;
+
+			const std::wstring c1 = what[2].str(); 
+			const std::wstring c2 = what[3].str(); 
+
+			if (convert_with_TableName)
 			{
-				id = (int)mapExternalLink_.size() + 1;
-				mapExternalLink_.insert(std::make_pair(external, id));
+				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
 			{
-				id = pFind->second;
+				return c1 + (c2.empty() ? L"" : (L":" + c2) );
 			}
-			if (sheet1[0] == L'\'')
+		}
+		else if (sz == 5 && 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(); //sheet name 2
+			const std::wstring c3 = what[4].str(); 
+
+			table_name_ = sheet1;
+
+			if (convert_with_TableName)
 			{
-				sheet1 = sheet1.substr(1, sheet1.length() - 2);
+				return (sheet1 + L"!") + c1 + (c3.empty() ? L"" : (L":" + c3) );
 			}
-			sheet1 = L"'[" + std::to_wstring(id) + L"]" + sheet1 + L"'";
-		}
-		else if (std::wstring::npos != sheet1.find(L" "))
-		{
-			if (sheet1[0] != L'\'')
+			else
 			{
-				sheet1 = L"'" + sheet1 + L"'";
+				return c1 + (c3.empty() ? L"" : (L":" + c3) );
 			}
 		}
-		
-		table_name_ = sheet1;
-		
-		if (convert_with_TableName)
+		else if (sz == 5 && !what[1].matched)
 		{
-			return (sheet1.empty() ? L"" : (sheet1 + L"!")) + ref1 + (ref2.empty() ? L"" : (L":" + ref2) );
-		}
-		else
-		{
-			return ref1 + (ref2.empty() ? L"" : (L":" + ref2) );
+			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)
 	{
-		boost::wregex complexRef(L"(?:\'([^\']*)\'#){0,1}\\${0,1}([^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]+\\${0,1}\\d+)(?::\\.(\\${0,1}[\\w^0-9]+\\${0,1}\\d+)){0,1}");
-//									  'external'#  $   Sheet2         . A1								 : ( $   Sheet2)? . B5   
+		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}");
+
 		std::wstring expr = what[1].str();
 		const std::wstring res = boost::regex_replace(
 			expr,
@@ -362,34 +232,26 @@ namespace formulasconvert {
 	// [$'Sheet2 A'.$B2] -> 'Sheet2 A'!$B2
 	void odf2oox_converter::Impl::replace_cells_range(std::wstring& expr, bool withTableName)
 	{
-		XmlUtils::replace_all( expr, L"#REF !", L"#REF!");
-		XmlUtils::replace_all( expr, L"#REF!#REF!", L"#REF!");
-		XmlUtils::replace_all( expr, L"$#REF!$#REF!", L"#REF!");
-
 		convert_with_TableName = withTableName;
 
-		//boost::wregex complexRef(L"\\[(?:\'([^\']*)\'#){0,1}\\[{0,1}(?:\\$){0,1}([^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::(\\${0,1}[^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}\\]{0,1}");
-		boost::wregex complexRef(L"(?:(?:(?:(?:\\[\'([^\']*)\'#)|(?:\'([^\']*)\'#\\[)))|(?:\\[))\
-(?:\\$){0,1}([^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::(\\${0,1}[^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}\\]");
-//									 [ 'external'#  [  $   Sheet2         . A1								 : ( $   Sheet2)? . B5                    ]
+		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								 : ( $   Sheet2)? . B5                    ]
+		*/
 
-		expr = boost::regex_replace(
-  			expr,
+		const std::wstring res = boost::regex_replace(
+			expr,
 			complexRef,
 			&replace_named_ref_formater,
 			boost::match_default | boost::format_all);
+		expr = res;
 	}
 	void odf2oox_converter::Impl::replace_named_ref(std::wstring & expr, bool withTableName)
 	{
-		XmlUtils::replace_all( expr, L"#REF !", L"#REF!");
-		XmlUtils::replace_all( expr, L"#REF!#REF!", L"#REF!");
-		XmlUtils::replace_all( expr, L"$#REF!$#REF!", L"#REF!");
-
 		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}(?:\'([^\']*)\'#){0,1}\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}\\]{0,1}");
-//									  'external'#  $   Sheet2         . A1								 : ( $   Sheet2)? . B5   
+		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,
@@ -418,7 +280,19 @@ namespace formulasconvert {
 	}
 
 
+	std::wstring replace_semicolons_formater(boost::wsmatch const & what)
+	{
+		if (what[1].matched)
+			return L",";
+		else if (what[2].matched)
+			return what[2].str();    
+		else if (what[3].matched)
+			return what[3].str();
+		else
+			return L"";
+	}
 
+	// TODO
 	// заменить точки с запятой во всех вхождениях кроме находящихся в кавычках --*и в фигурных скобках*--
 	void odf2oox_converter::Impl::replace_semicolons(std::wstring& expr)
 	{
@@ -428,20 +302,126 @@ namespace formulasconvert {
 			boost::wregex(L"(;)|(\".*?\")|('.*?')"),
 			&replace_semicolons_formater,
 			boost::match_default | boost::format_all);
-
 		 expr = res;
 	}
-	void odf2oox_converter::Impl::replace_tilda(std::wstring& expr)
+
+	std::wstring replace_vertical_formater(boost::wsmatch const & what)
 	{
-		 const std::wstring res = boost::regex_replace(
-			expr,
-			//boost::wregex(L"(;)|(?:\".*?\")|(?:'.*?')"),
-			boost::wregex(L"(~)|(\".*?\")|('.*?')"),
-			&replace_semicolons_formater,
-			boost::match_default | boost::format_all);
-
-		 expr = res;
+		if (what[1].matched)
+		{
+			std::wstring inner = what[1].str();
+			XmlUtils::replace_all( inner, L"|", L";");
+			return L"{" + inner + L"}";
+		}    
+		else if (what[2].matched)
+			return what[2].str();
+		else if (what[3].matched)
+			return what[3].str();
+	
+		return L"";
 	}
+
+	std::wstring replace_point_space(boost::wsmatch const & what)
+	{
+		if (what[1].matched)
+		{
+			std::wstring inner = what[1].str();
+			XmlUtils::replace_all( inner, L" ", L"PROBEL");
+			return inner;
+		}    
+		else if (what[2].matched)
+			return what[2].str();
+		else if (what[3].matched)
+			return what[3].str();
+	
+		return L"";
+	}
+	std::wstring convert_scobci(boost::wsmatch const & what)
+	{
+		if (what[1].matched)
+		{
+			std::wstring inner = what[1].str();
+			XmlUtils::replace_all( inner, L".", L"ТОСHKA");
+			XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+			XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
+
+			XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+			XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
+			
+			XmlUtils::replace_all( inner, L" ", L"PROBEL");
+			XmlUtils::replace_all( inner, L"'", L"APOSTROF");
+			return inner;
+		}
+		else if (what[2].matched)
+		{
+			std::wstring inner = what[2].str();
+			XmlUtils::replace_all( inner, L".", L"ТОСHKA");
+
+			XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+			XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
+
+ 			XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+			XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
+			
+			XmlUtils::replace_all( inner, L" ", L"PROBEL");
+			XmlUtils::replace_all( inner, L"\"", L"KAVYCHKA");
+			return inner;
+		}
+		else if (what[3].matched)
+			return what[3].str();
+	
+		return L"";
+	}
+	std::wstring replace_space_formater(boost::wsmatch const & what)
+	{
+		if (what[1].matched)
+		{
+			std::wstring inner = what[1].str();
+			XmlUtils::replace_all( inner, L" ", L",");
+			return inner;
+		}    
+		else if (what[2].matched)
+			return what[2].str();
+		else if (what[3].matched)
+			return what[3].str();
+
+		return L"";
+	}
+
+
+	//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 is_forbidden(const std::wstring & formula)
+	{
+		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, it->first))
+			{
+
+				XmlUtils::replace_all(result, it->first, it->second);
+			}
+		}
+		return result;
+	}
+
 	// заменить вертикальную черту во всех вхождениях в фигурных скобках, но не внутри строк
 	void odf2oox_converter::Impl::replace_vertical(std::wstring& expr)
 	{
@@ -466,17 +446,22 @@ namespace formulasconvert {
 	std::wstring odf2oox_converter::Impl::convert(const std::wstring& 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,
+		//	complexRef,
+		//	&replace_point_space,
+		//	boost::match_default | boost::format_all);	
 
 		bool isFormula = check_formula(workstr);
 
-//экранирование
-		workstr = boost::regex_replace(workstr,			
+		boost::regex_replace(
+			workstr,
 			boost::wregex(L"('.*?')|(\".*?\")"),
 			&convert_scobci, boost::match_default | boost::format_all);
 
 		replace_cells_range	(workstr, true);
 		replace_semicolons	(workstr);
-		replace_tilda		(workstr);
 		replace_vertical	(workstr);
 		
 		if (isFormula)
@@ -484,9 +469,9 @@ namespace formulasconvert {
 			XmlUtils::replace_all( workstr, L"FDIST(", L"_xlfn.F.DIST(");
 			// ROUNDUP( - тут в oox 2 параметра - разрядность нужно - ,0) - EV Requirements v2.2.3.ods
 			
-			if (std::wstring::npos != workstr.find(L"CONCATINATE"))
+			int res_find=0;
+			if ((res_find = workstr.find(L"CONCATINATE")) > 0)
 			{
-				bool l = true;
 				//могут быть частично заданы диапазоны
 				//todooo
 			}	
@@ -501,23 +486,39 @@ namespace formulasconvert {
 
 
 	//-----------------------------------------------------------
-		replace_tmp_back(workstr);
+ 		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
+		XmlUtils::replace_all( workstr, L"APOSTROF"	, L"'");
+		XmlUtils::replace_all( workstr, L"ТОСHKA"	, L".");
+
+		XmlUtils::replace_all( workstr, L"SCOBCAIN"	, L"(");
+		XmlUtils::replace_all( workstr, L"SCOBCAOUT"	, L")");
+
+		XmlUtils::replace_all( workstr, L"KVADRATIN"	, L"[");
+		XmlUtils::replace_all( workstr, L"KVADRATOUT", L"]");
+
+		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
+		XmlUtils::replace_all( workstr, L"KAVYCHKA"	, L"\"");
 
 		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 = boost::regex_replace(
+		std::wstring workstr = expr;
+		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
+
+		workstr = boost::regex_replace(
 			expr,
-			boost::wregex(L"('.*?')|(\".*?\")"),
-			&convert_scobci, boost::match_default | boost::format_all);
+			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++)
 		{
-			replace_tmp_back(out[i]);
+ 			XmlUtils::replace_all( out[i], L"PROBEL", L" ");
+			XmlUtils::replace_all( out[i], L"TOCHKA", L".");
 		}
 	}
 
@@ -527,10 +528,15 @@ namespace formulasconvert {
 
 	std::wstring odf2oox_converter::Impl::convert_chart_distance(const std::wstring& expr)
 	{
-		std::wstring workstr = boost::regex_replace(
-			is_forbidden(expr),
-			boost::wregex(L"('.*?')|(\".*?\")"),
-			&convert_scobci, boost::match_default | boost::format_all);
+		std::wstring workstr = is_forbidden(expr);
+
+		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
+
+		workstr = boost::regex_replace(
+			expr,
+			complexRef,
+			&replace_point_space,
+			boost::match_default | boost::format_all);
 	    
 		//распарсить по диапазонам - одф-пробел, ик-эль-запятая
 
@@ -562,10 +568,10 @@ namespace formulasconvert {
 				cells_out.append(cells[j]);
 				cells_out.append(L":");
 			}
-			size_t res1 = sheet.find(L"-");
-			size_t res2 = sheet.find(L"'");
+			int res1 = sheet.find(L"-");
+			int res2 = sheet.find(L"'");
 			
-			if (res1 != std::wstring::npos && res2 != std::wstring::npos && !(res2 == 0))
+			if (res1 >= 0 && !(res2 == 0))
 			{
 				sheet = L"'" + sheet + L"'";
 			}
@@ -579,78 +585,12 @@ namespace formulasconvert {
 			result.append(distance_out[i]);
 			result.append(L",");
 		}
- 		replace_tmp_back( result );
+ 		XmlUtils::replace_all( result, L"PROBEL" , L" ");
+		XmlUtils::replace_all( result, L"TOCHKA", L".");
 		
 		return result.substr(0, result.size() - 1);// минус последняя лишняя запятая
 	}
-	std::wstring odf2oox_converter::Impl::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator)
-	{
-		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
-
-		std::wstring workstr = expr;
-
-		workstr = boost::regex_replace(
-			workstr,
-			boost::wregex(L"('.*?')|(\".*?\")"),
-			&convert_scobci, boost::match_default | boost::format_all);
-
-		replace_named_ref(workstr, withTableName);
-
-		if (separator != L" ")
-		{
-			XmlUtils::replace_all( workstr, L" ", separator);
-		}
-
-		replace_tmp_back( workstr );
-
-		if (table_name_.empty() == false)
-		{
-			replace_tmp_back( table_name_ );
-		}
-		return workstr;
-	}
-	std::wstring odf2oox_converter::Impl::convert_named_expr(const std::wstring& expr, bool withTableName)
-	{
-		std::wstring workstr = expr;
-
-		bool isFormula = check_formula(workstr);
-
-		if (isFormula)
-		{
-			workstr = convert(expr);
-		}
-		else
-		{
-
-			workstr = boost::regex_replace(
-				workstr,
-				boost::wregex(L"('.*?')|(\".*?\")"),
-				&convert_scobci, boost::match_default | boost::format_all);
-
-		   
-			replace_cells_range(workstr, withTableName);
-			replace_semicolons(workstr);
-			replace_vertical(workstr);
-
-			size_t res_find = 0;
-			if ((res_find = workstr.find(L"CONCATINATE")) != std::wstring::npos)
-			{
-				//могут быть частично заданы диапазоны
-				//todooo
-
-			}
-			replace_tmp_back(workstr);
-
-			if (table_name_.empty() == false)
-			{
-				replace_tmp_back(table_name_);
- 			}
-		}
-		return workstr;
-	}
-
-//------------------------------------------------------------------------------------------------------------
-	odf2oox_converter::odf2oox_converter() : impl_(new odf2oox_converter::Impl())
+	odf2oox_converter::odf2oox_converter(): impl_(new odf2oox_converter::Impl)
 	{
 	}
 
@@ -677,11 +617,82 @@ namespace formulasconvert {
 	}
 	std::wstring odf2oox_converter::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator)
 	{
-		return impl_->convert_named_ref(expr, withTableName, separator);
+		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
+
+		std::wstring workstr = boost::regex_replace(
+			expr,
+			complexRef,
+			&replace_point_space,
+			boost::match_default | boost::format_all);	
+		
+		XmlUtils::replace_all( workstr, L"'", L"APOSTROF");
+		//XmlUtils::replace_all( workstr, L"", L"APOSTROF");
+
+		impl_->replace_named_ref(workstr, withTableName);
+
+		if (separator != L" ")
+		{
+			XmlUtils::replace_all( workstr, L" "	, separator);
+		}
+
+		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)
 	{
-		return impl_->convert_named_expr(expr, withTableName);
+		std::wstring workstr = expr;
+
+		bool isFormula = impl_->check_formula(workstr);
+
+		if (isFormula)
+		{
+			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".");
+			}
+		}
+		return workstr;
 	}
 
 	std::wstring odf2oox_converter::convert_ref(std::wstring const & expr)
@@ -694,8 +705,8 @@ namespace formulasconvert {
 	{
 		while(true)
 		{
-			size_t pos = expr.find(L"%20");
-			if (pos == std::wstring::npos)break;
+			int pos = expr.find(L"%20");
+			if (pos <0)break;
 
 			expr.replace(pos,3,L" ");
 		}

ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp

@@ -32,6 +32,7 @@
 #include "formulasconvert.h"
 
 #include <boost/regex.hpp>
+#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include"../../Common/DocxFormat/Source/XML/Utils.h"
@@ -39,22 +40,6 @@
 namespace cpdoccore {
 namespace formulasconvert {
 
-	static std::wstring forbidden_formulas1[] =
-	{
-		L"NULLFORMULA()"
-		/*
-		L"BETADIST",
-		L"CEILING",
-		L"FLOOR",
-		L"RANK",
-		L"ROUND",
-		L"ROUNDDOWN",
-		L"ROUNDUP",
-		L"SUBTOTAL",
-		L"FORMULA",
-		L"ISREF"*/
-	};
-
 class oox2odf_converter::Impl
 {
 public:
@@ -64,7 +49,7 @@ public:
 	std::wstring convert_conditional_formula(const std::wstring& expr);
 
 	std::wstring convert_chart_distance(const std::wstring& expr);
-    static void replace_cells_range(std::wstring& expr, bool bSelect = true);
+    static void replace_cells_range(std::wstring& expr);
   
 	static void replace_semicolons(std::wstring& expr);
     static void replace_vertical(std::wstring& expr);
@@ -75,104 +60,7 @@ public:
 	static std::wstring replace_arguments(boost::wsmatch const & what);
 	static std::wstring convert_scobci(boost::wsmatch const & what);
 	
-	static std::wstring replace_tilda_formater(boost::wsmatch const & what)
-	{
-		if (what[1].matched)
-			return L";";
-		else if (what[2].matched)
-			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"";
-	}
-	static std::wstring replace_semicolons_formater(boost::wsmatch const & what)
-	{
-		if (what[1].matched)
-			return L";";
-		else if (what[2].matched)
-			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"";
-	}
-	static std::wstring replace_vertical_formater(boost::wsmatch const & what)
-	{
-		if (what[1].matched)
-		{
-			std::wstring inner = what[1].str();
-			XmlUtils::replace_all( inner, L";", L"|");
-			return L"{" + inner + L"}";
-		}    
-		else if (what[2].matched)
-			return what[2].str();
-		else if (what[3].matched)
-			return what[3].str();
-		
-		return L"";
-	}
-	static std::wstring replace_space_formater(boost::wsmatch const & what)
-	{
-		if (what[1].matched)
-		{
-			std::wstring inner = what[1].str();
-			XmlUtils::replace_all( inner, L",", L" ");
-			return inner;
-		}    
-		else if (what[2].matched)
-			return what[2].str();
-		else if (what[3].matched)
-			return what[3].str();
-
-		return L"";
-	}
-	static void oox_replace_tmp_back(std::wstring &expr)
-	{
-		XmlUtils::replace_all( expr, L"ТОСHKA", L".");
-		XmlUtils::replace_all( expr, L"VOSKL", L"!");
-
-		XmlUtils::replace_all( expr, L"SCOBCAIN", L"(");
-		XmlUtils::replace_all( expr, L"SCOBCAOUT", L")");
-
-		XmlUtils::replace_all( expr, L"KVADRATIN", L"[");
-		XmlUtils::replace_all( expr, L"KVADRATOUT", L"]");
-		
-		XmlUtils::replace_all( expr, L"PROBEL", L" ");
-		XmlUtils::replace_all( expr, L"APOSTROF", L"'");	
-		XmlUtils::replace_all( expr, L"KAVYCHKA", L"\"");
-	}
-
-	static void oox_replace_tmp(std::wstring &expr)
-	{
-		XmlUtils::replace_all( expr, L".", L"ТОСHKA");
-		XmlUtils::replace_all( expr, L"!", L"VOSKL");
-
-		XmlUtils::replace_all( expr, L"(", L"SCOBCAIN");
-		XmlUtils::replace_all( expr, L")", L"SCOBCAOUT");
-
-		XmlUtils::replace_all( expr, L"[", L"KVADRATIN");
-		XmlUtils::replace_all( expr, L"]", L"KVADRATOUT");
-		
-		XmlUtils::replace_all( expr, L" ", L"PROBEL");
-		XmlUtils::replace_all( expr, L"'", L"APOSTROF");	
-		XmlUtils::replace_all( expr, L"\"", L"KAVYCHKA");
-	}
-
-	static bool is_forbidden1(const std::wstring & formula)
-	{
-		for (size_t i = 0; i < 1; i++)
-		 {
-			if (boost::algorithm::contains(formula, forbidden_formulas1[i]))
-				return true;
-		}
-		return false;
-	}
-	void replace_named_ref(std::wstring & expr);
+    void replace_named_ref(std::wstring & expr);
     void replace_named_formula(std::wstring & expr);
 	
 	static bool isFindBaseCell_;
@@ -183,11 +71,8 @@ public:
 bool			oox2odf_converter::Impl::isFindBaseCell_ = false;
 std::wstring	oox2odf_converter::Impl::table_name_ = L"";
 
-void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr, bool bSelect)
+void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr)
 {
-	if ((0 == expr.find(L"KAVYCHKA")) && (expr.length() - 8 == expr.rfind(L"KAVYCHKA") ))
-		return;
-
 	boost::wregex re(L"([:$!])+");
 
 	boost::wsmatch result;
@@ -195,7 +80,7 @@ void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr, bool bSele
 
 	if (b)
 	{
-		boost::wregex re1(L"(\\$?[^\']+\\!)?([\\w^0-9$]*\\d*)\\:?([\\w^0-9$]*\\d*)?");
+		boost::wregex re1(L"(\\$?\\w+\\!)?([a-zA-Z$]*\\d*)\\:?([a-zA-Z$]*\\d*)?");
 //                          $   Sheet2   ! $ A1                 :  $ B5    
 //                          $   Sheet2   ! $ A                  :  $ A    
 //                          $   Sheet2   ! $ 1                  :  $ 1    
@@ -204,7 +89,7 @@ void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr, bool bSele
 		std::wstring res = boost::regex_replace(
 			workstr,	
 			re1,
-			bSelect ? &replace_cells_range_formater1 : &replace_cells_range_formater2,
+			&replace_cells_range_formater1,
 			boost::match_default | boost::format_all);
 	     
 		 expr = res;
@@ -227,12 +112,8 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater1(boost::wsmat
 
         std::wstring c1 = what[2].str(); 
         std::wstring c2 = what[3].str(); 
-
-		if ((0 == c1.find(L"KAVYCHKA")) && (c1.length() - 8 == c1.rfind(L"KAVYCHKA") ))
-		{
-			return c1;
-		}
-		else if (!c1.empty() || !c2.empty() || !sheet.empty())
+		
+		if (!c1.empty() || !c2.empty() || !sheet.empty())
 		{      
 			XmlUtils::replace_all( sheet, L"!", L"");
 
@@ -242,8 +123,9 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater1(boost::wsmat
 			}	
 			if (!sheet.empty()  && (std::wstring::npos != c1.find(L"$"))) sheet = L"$"  + sheet;
 
-
-			s =  L"["  + sheet + L"." + c1 + (c2.empty() ? L"" : (L":" + sheet  + L"." + c2)) + std::wstring(L"]");
+			s =  std::wstring(L"[")  + sheet + L"." + 
+									 c1 +
+									(c2.empty() ? L"" : (L":" + sheet  + L"." + c2) ) + std::wstring(L"]");
 		}
         return s;
 	}
@@ -263,43 +145,18 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater2(boost::wsmat
 {
     const size_t sz = what.size();
 	
-	if (sz > 3)
-    {
-		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(); 
-
-		if ((0 == c1.find(L"KAVYCHKA")) && (c1.length() - 8 == c1.rfind(L"KAVYCHKA") ))
-		{
-			return c1;
-		}
-		else if (!c1.empty() || !c2.empty() || !sheet.empty())
-		{      
-			XmlUtils::replace_all( sheet, L"!", 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 =  sheet + L"." + c1 + (c2.empty() ? L"" : (L":" + sheet  + L"." + c2)) + std::wstring(L"");
-		}
-        return s;
-	}
-	else
+	if (sz > 2)
 	{
         const std::wstring c1 = what[1].str(); 
         const std::wstring c2 = what[2].str(); 
 
-		const std::wstring s =  std::wstring(L".") +  c1 + (c2.empty() ? L"" : (L":." + c2) );
+		const std::wstring s =  std::wstring(L"[.") +  c1 + (c2.empty() ? L"" : (L":." + c2) ) + std::wstring(L"]");
 
 		return s; 
 	}
-	return L"";
+
+    return L"";
+
 }
 		
 void oox2odf_converter::Impl::replace_named_formula(std::wstring & expr)
@@ -311,6 +168,7 @@ void oox2odf_converter::Impl::replace_named_formula(std::wstring & expr)
 	isFindBaseCell_ = false;
 }
 
+  // Лист1!$A$1 -> $Лист1.$A$1 
 void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 {
 	table_name_.clear();
@@ -321,22 +179,27 @@ void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 	replace_vertical(workstr);
 	replace_semicolons(workstr);		
 	
-	std::wstring res1 = boost::regex_replace(
-        workstr,
-		boost::wregex(L"('.*?')|(\".*?\")"),
-		&oox2odf_converter::Impl::convert_scobci, boost::match_default | boost::format_all);
-
 	std::vector<std::wstring> distance;
 
-	boost::algorithm::split(distance, res1, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
+	boost::algorithm::split(distance,workstr, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
 
 	for (size_t i = 0; i < distance.size(); i++)
 	{		
 		std::wstring &d = distance[i];
 
-		replace_cells_range(d, false);
+		XmlUtils::replace_all( d, L"(", L"SCOBCAIN");
+		XmlUtils::replace_all( d, L")", L"SCOBCAOUT");
+		XmlUtils::replace_all( d, L" ", L"PROBEL");
+		XmlUtils::replace_all( d, L"'", L"APOSTROF");
+		XmlUtils::replace_all( d, L"\"", L"KAVYCHKA");
+		
+		replace_cells_range(d);
 
-		oox_replace_tmp_back(d);
+		XmlUtils::replace_all( d, L"SCOBCAIN", L"(");
+		XmlUtils::replace_all( d, L"SCOBCAOUT", L")");
+		XmlUtils::replace_all( d, L"PROBEL", L" ");
+		XmlUtils::replace_all( d, L"APOSTROF", L"'");
+		XmlUtils::replace_all( d, L"KAVYCHKA", L"\"");
 			
 		out = out + d + std::wstring(L";");
 	}
@@ -347,11 +210,33 @@ void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 
 	if (table_name_.empty() == false)
 	{
-		oox_replace_tmp_back(table_name_);
+		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"\"");
 	}
 }
 
 
+namespace 
+{
+
+std::wstring replace_semicolons_formater(boost::wsmatch const & what)
+{
+    if (what[1].matched)
+        return L";";
+    else if (what[2].matched)
+        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
 // заменить запятые на точки с запятой во всех вхождениях кроме находящихся в кавычках --*и в фигурных скобках*--
@@ -367,7 +252,67 @@ void oox2odf_converter::Impl::replace_semicolons(std::wstring& expr)
      expr = res;
 }
 
+namespace 
+{
 
+std::wstring replace_vertical_formater(boost::wsmatch const & what)
+{
+    if (what[1].matched)
+    {
+        std::wstring inner = what[1].str();
+        XmlUtils::replace_all( inner, L";", L"|");
+        return L"{" + inner + L"}";
+    }    
+    else if (what[2].matched)
+        return what[2].str();
+    else if (what[3].matched)
+        return what[3].str();
+	
+	return L"";
+}
+std::wstring replace_space_formater(boost::wsmatch const & what)
+{
+    if (what[1].matched)
+    {
+        std::wstring inner = what[1].str();
+        XmlUtils::replace_all( inner, L",", L" ");
+        return inner;
+    }    
+    else if (what[2].matched)
+        return what[2].str();
+    else if (what[3].matched)
+        return what[3].str();
+
+	return L"";
+}
+
+}
+
+std::wstring forbidden_formulas1[] =
+{
+    L"NULLFORMULA()"
+    /*
+    L"BETADIST",
+    L"CEILING",
+    L"FLOOR",
+    L"RANK",
+    L"ROUND",
+    L"ROUNDDOWN",
+    L"ROUNDUP",
+    L"SUBTOTAL",
+    L"FORMULA",
+    L"ISREF"*/
+};
+
+bool is_forbidden1(const std::wstring & formula)
+{
+    BOOST_FOREACH(const std::wstring & s, forbidden_formulas1)
+    {
+        if (boost::algorithm::contains(formula, s))
+            return true;
+    }
+    return false;
+}
 //void oox2odf_converter::Impl::split_(std::wstring& expr)
 //{
 //     const std::wstring res = boost::regex_split(
@@ -398,18 +343,47 @@ void oox2odf_converter::Impl::replace_space(std::wstring& expr)
      expr = res;
 }
 
+std::wstring replace_(boost::wsmatch const & what)
+{
+    if (what[1].matched)
+    {
+        std::wstring inner = what[1].str();
+        XmlUtils::replace_all( inner, L",", L" ");
+        return inner;
+    }    
+    else if (what[2].matched)
+        return what[2].str();
+    else if (what[3].matched)
+        return what[3].str();
+
+	return L"";
+}
 std::wstring oox2odf_converter::Impl::convert_scobci(boost::wsmatch const & what)
 {
     if (what[1].matched)
     {
         std::wstring inner = what[1].str();
-        oox_replace_tmp(inner);
+        XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+        XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
+
+		XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+		XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
+		
+		XmlUtils::replace_all( inner, L" ", L"PROBEL");
+        XmlUtils::replace_all( inner, L"'", L"APOSTROF");
 		return inner;
 	}
     else if (what[2].matched)
     {
         std::wstring inner = what[2].str();
-        oox_replace_tmp(inner);
+        XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+        XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
+
+ 		XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+		XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
+		
+		XmlUtils::replace_all( inner, L" ", L"PROBEL");
+        XmlUtils::replace_all( inner, L"\"", L"KAVYCHKA");
 		return inner;
 	}
     else if (what[3].matched)
@@ -422,7 +396,7 @@ std::wstring  oox2odf_converter::Impl::replace_arguments(boost::wsmatch const &
 {
 	std::wstring out;
 
-	size_t sz = what.size();
+	int sz = what.size();
 
     if (what[1].matched)
     {
@@ -458,13 +432,13 @@ std::wstring oox2odf_converter::Impl::convert(const std::wstring& expr)
     if (is_forbidden1(expr))
         return L"NULLFORMULA";
 
-	std::wstring workstr = expr;
+    std::wstring workstr = expr;
     replace_cells_range(workstr);
     replace_vertical(workstr);
     replace_semicolons(workstr);
     return workstr;
 }
-// (Formula) -> of:=(Formula) 
+// of:=(Formula) -> (Formula)
 std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 {
     std::wstring workstr = expr;
@@ -476,13 +450,9 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 	
 	std::wstring res = boost::regex_replace(
 		res1,
-		boost::wregex(L"(?!([\\w^0-9]+\\d*\\())(([\\w^0-9]+\\!)?\\$?[\\w^0-9]*\\$?\\d*(\\:\\$?[\\w^0-9]*\\$?\\d*){0,1})"),
+		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);
 
-	//SUBTOTAL(109,Expense31[Amount])
-	XmlUtils::replace_all( res, L"[", L"KVADRATIN");
-	XmlUtils::replace_all( res, L"]", L"KVADRATOUT");
-
 	if (res1 == res)
 	{
 		XmlUtils::replace_all( res1, L"KAVYCHKA", L"\""); //IMCONJUGATE_emb.xlsx
@@ -494,7 +464,16 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 			boost::match_default | boost::format_all);
 	}
 
-	oox_replace_tmp_back(res);
+    XmlUtils::replace_all( res, L"SCOBCAIN", L"(");
+    XmlUtils::replace_all( res, L"SCOBCAOUT", L")");
+
+	XmlUtils::replace_all( res, L"KVADRATIN", L"[");
+	XmlUtils::replace_all( res, L"KVADRATOUT", L"]");
+    
+
+    XmlUtils::replace_all( res, L"APOSTROF", L"'");
+
+    XmlUtils::replace_all( res, L"KAVYCHKA", L"\"");
 
 	replace_vertical(res);   
 	replace_semicolons(res);
@@ -503,7 +482,17 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 
 	if (table_name_.empty() == false)
 	{
-		oox_replace_tmp_back(table_name_);
+		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;
@@ -532,7 +521,12 @@ std::wstring oox2odf_converter::Impl::convert_conditional_formula(const std::wst
 	     
 	}
 
-    oox_replace_tmp_back( res);
+    XmlUtils::replace_all( res, L"SCOBCAIN", L"(");
+    XmlUtils::replace_all( res, L"SCOBCAOUT", L")");
+
+    XmlUtils::replace_all( res, L"APOSTROF", L"'");
+
+    XmlUtils::replace_all( res, L"KAVYCHKA", L"\"");
 
 	replace_vertical(res);
 	replace_semicolons(res);
@@ -562,7 +556,7 @@ std::wstring oox2odf_converter::Impl::convert_chart_distance(const std::wstring&
 	
 	boost::algorithm::split(distance_inp,expr, boost::algorithm::is_any_of(L","), boost::algorithm::token_compress_on);
 
-	for (size_t i = 0; i < distance_inp.size(); i++)
+	for (int i = 0; i < distance_inp.size(); i++)
 	{
 		std::wstring sheet;
 		std::vector<std::wstring> range;
@@ -570,7 +564,7 @@ std::wstring oox2odf_converter::Impl::convert_chart_distance(const std::wstring&
 
 		boost::algorithm::split(range, distance_inp[i], boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
 
-		for (size_t j = 0 ; j < range.size(); j++)
+		for (int j = 0 ; j < range.size(); j++)
 		{
 			int pos = range[j].find('!'); 
 			if (0 <= pos)
@@ -582,7 +576,7 @@ std::wstring oox2odf_converter::Impl::convert_chart_distance(const std::wstring&
 
 		}
 		std::wstring cells_out;
-		for (size_t c = 0; c < cells.size(); c++)
+		for (int c = 0; c < cells.size(); c++)
 		{
 			if (!sheet.empty())
 				cells_out += sheet + L".";
@@ -601,7 +595,7 @@ std::wstring oox2odf_converter::Impl::convert_chart_distance(const std::wstring&
 	}
 	std::wstring result;
 
-	for (size_t i = 0 ; i < distance_out.size(); i++)
+	for (int i = 0 ; i < distance_out.size(); i++)
 	{
 		result += distance_out[i];
 		result += L" ";
@@ -648,6 +642,8 @@ std::wstring oox2odf_converter::get_table_name()
 {
     return impl_->table_name_;
 }
+
+
 std::wstring oox2odf_converter::convert_ref(std::wstring const & expr)
 {
     std::wstring workstr = expr;
@@ -673,10 +669,9 @@ size_t getColAddressInv(const std::wstring & a_)
     size_t mul = 1;
     bool f = true;
     size_t res = 0;
-
-	for (int i = a.length() - 1; i >= 0; i--)
+    BOOST_REVERSE_FOREACH(const wchar_t c, a)
     {
-        size_t v = a[i] - L'A';
+        size_t v = c - L'A';
         if (f)
             f = false;
         else
@@ -705,13 +700,14 @@ void splitCellAddress(const std::wstring & a_, std::wstring & col, std::wstring
     ::XmlUtils::replace_all( a, L"$", L"");
     //::XmlUtils::replace_all( a, L"'", L"");
 	::boost::algorithm::to_upper(a);
+	
 
-	for (size_t i = 0; i < a.length(); i++)
+	BOOST_FOREACH(wchar_t c, a)
     {
-		if (a[i] >= L'0' && a[i] <= L'9')
-			row += a[i];
+		if (c >= L'0' && c <= L'9')
+			row +=c;
 		else
-			col += a[i];
+			col += c;
     }
 	std::reverse(col.begin(), col.end());
 	std::reverse(row.begin(), row.end());
@@ -735,7 +731,7 @@ int oox2odf_converter::get_count_value_points(std::wstring expr)
 	XmlUtils::replace_all( expr, L")", L"");
 	boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L","), boost::algorithm::token_compress_on);
 
-	for (size_t i=0; i < splitted.size(); i++)
+	for (long i=0; i < splitted.size(); i++)
 	{
 		int res = splitted[i].find(L"!");
 		if (res > 0) splitted[i] = splitted[i].substr(res+1, splitted[i].size()-res);

ASCOfficeOdfFile/include/odf/odf_elements_type.h

@@ -52,10 +52,8 @@ enum ElementType
     typeTextReferenceMarkEnd,
 	typeTextReferenceRef,
 
-	typeFieldFieldmarkStart,
-	typeFieldFieldmarkEnd,
-	typeFieldFieldmark,
-	typeFieldParam,
+	typeTextFieldFieldmarkStart,
+	typeTextFieldFieldmarkEnd,
 
     typeTextSpan,
     typeTextA,
@@ -332,7 +330,6 @@ enum ElementType
     typeTableTableRowGroup,
 	typeTableTableRowNoGroup,
     typeTableTableSource,
-	typeTableTableProtection,
 
 	typeTableDataPilotTables,
 	typeTableDataPilotTable,
@@ -455,7 +452,6 @@ enum ElementType
 	typeDrawPolyline,
 	typeDrawRegularPolyline,
 	typeDrawPath,
-	typeDrawContourPath,
 	typeDrawCircle,
 	typeDrawg,
 	typeDrawPageThumbnail,
@@ -505,7 +501,6 @@ enum ElementType
 	typeFormTextarea,
 	typeFormTime,
 	typeFormValueRange,
-	typeFormItem,
 
 	typeDrawPage,    
 	typePresentationFooterDecl,

ASCOfficeOdfFile/include/xml/attributes.h

@@ -43,7 +43,7 @@
 #include <boost/variant.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "../../../Common/DocxFormat/Source/XML/Utils.h"
+#include "../../../../Common/DocxFormat/Source/XML/Utils.h"
 
 namespace cpdoccore 
 {

ASCOfficeOdfFile/include/xml/simple_xml_writer.h

@@ -310,7 +310,6 @@ typedef xml::writer::element<wchar_t> xml_element;
 #define CP_XML_WRITER(STRM) if (bool _b_ = false) {} else for (xml_writer _xml_wr_((STRM));!_b_;_b_=true)
 #define CP_XML_NODE(NAME) if (bool _b_ = false) {} else for (xml_element _xml_node_(_xml_wr_, (NAME));!_b_;_b_=true)
 #define CP_XML_ATTR(NAME, VAL) _xml_node_.attr((NAME),(VAL))
-#define CP_XML_ATTR2(NAME, VAL) _xml_node_.attr((std::wstring(NAME).c_str()),(VAL))
 #define CP_XML_CONTENT(VAL) _xml_node_.contents((VAL))
 #define CP_XML_STREAM() _xml_node_.stream()
 

ASCOfficeOdfFile/include/xml/utils.h

@@ -45,7 +45,7 @@ namespace utils {
 		std::wstring replace_xml_to_text_ImplRegEx(const std::wstring & Text);
 		std::string replace_xml_to_text_ImplRegEx(const std::string & Text);
 
-		std::wstring replace_text_to_xml_ImplReplace(const std::wstring & Text, bool dDeleteUnicode = false);
+		std::wstring replace_text_to_xml_ImplReplace(const std::wstring & Text);
 		std::string replace_text_to_xml_ImplReplace(const std::string & Text);
 
 		std::wstring replace_amp_text_to_xml_ImplReplace(const std::wstring & Text);
@@ -55,7 +55,7 @@ namespace utils {
 		std::string replace_xml_to_text_ImplReplace(const std::string & Text);
 	}
 
-	std::wstring replace_text_to_xml(const std::wstring & Text, bool dDeleteUnicode = false);
+	std::wstring replace_text_to_xml(const std::wstring & Text);
 	std::string replace_text_to_xml(const std::string & Text);
 
 	std::wstring replace_amp_text_to_xml(const std::wstring & Text);

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -214,8 +214,8 @@ SOURCES += \
     ../src/odf/datatypes/tablefunction.cpp \
     ../src/odf/datatypes/tableorder.cpp \
     ../src/odf/datatypes/dategroup.cpp \
-    ../src/odf/datatypes/bibliography.cpp \
-    ../src/odf/datatypes/commandtype.cpp \
+    ../src/odf/datatypes/bibliography \
+    ../src/odfcommandtype.cpp \
     ../src/docx/xlsx_conditionalFormatting.cpp \
     ../src/docx/xlsx_dxfs.cpp \
     ../src/docx/docx_content_type.cpp \

ASCOfficeOdfFile/src/ConvertOO2OOX.cpp

@@ -43,7 +43,7 @@
 
 #include "../include/odf/odf_document.h"
 
-_UINT32 ConvertOds2Xlsx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
+int ConvertOds2Xlsx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
 {
     cpdoccore::oox::package::xlsx_document outputXlsx;
 	cpdoccore::oox::xlsx_conversion_context conversionContext( &inputOdf);
@@ -56,7 +56,7 @@ _UINT32 ConvertOds2Xlsx(cpdoccore::odf_reader::odf_document & inputOdf, const st
 	outputXlsx.write(dstPath);
     return 0;
 }
-_UINT32 ConvertOdt2Docx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
+int ConvertOdt2Docx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
 {
     cpdoccore::oox::package::docx_document	outputDocx;
     cpdoccore::oox::docx_conversion_context conversionContext(&inputOdf);
@@ -70,7 +70,7 @@ _UINT32 ConvertOdt2Docx(cpdoccore::odf_reader::odf_document & inputOdf, const st
 		
     return 0;
 }
-_UINT32 ConvertOdp2Pptx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
+int ConvertOdp2Pptx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
 {
     cpdoccore::oox::package::pptx_document	outputPptx;
     cpdoccore::oox::pptx_conversion_context conversionContext(&inputOdf);
@@ -83,9 +83,9 @@ _UINT32 ConvertOdp2Pptx(cpdoccore::odf_reader::odf_document & inputOdf, const st
 
     return 0;
 }
-_UINT32 ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack)
+int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack)
 {
-	_UINT32 nResult = 0;
+	int nResult = 0;
 
 	try 
     {
@@ -134,9 +134,9 @@ _UINT32 ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstP
 
 }
 
-_UINT32 ConvertOTF2ODF(const std::wstring & srcPath)
+int ConvertOTF2ODF(const std::wstring & srcPath)
 {
-	_UINT32 nResult = 0;
+	int nResult = 0;
 	
 	std::wstring manifest_xml	= srcPath + FILE_SEPARATOR_STR + L"META-INF" + FILE_SEPARATOR_STR + L"manifest.xml";
 	std::wstring mimetype_xml	= srcPath + FILE_SEPARATOR_STR + L"mimetype";

ASCOfficeOdfFile/src/ConvertOO2OOX.h

@@ -31,11 +31,10 @@
  */
 
 #include "../../DesktopEditor/common/Types.h"
-#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 #include <string>
 
 struct ProgressCallback;
 
-_UINT32 ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack);
+int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack);
 
-_UINT32 ConvertOTF2ODF(const std::wstring & otfPath);
+int ConvertOTF2ODF(const std::wstring & otfPath);

ASCOfficeOdfFile/src/common/CPColorUtils.cpp

@@ -31,6 +31,7 @@
  */
 
 #include <string>
+#include <boost/foreach.hpp>
 #include <cmath>
 
 #include <boost/optional/optional_io.hpp>
@@ -77,13 +78,14 @@ std::wstring RGBToString(int r, int g, int b)
     color v(r, g, b);
     double minDist = (std::numeric_limits<double>::max)();
     
-    for (size_t i = 0; i < 6; i++)
+    
+    BOOST_FOREACH(color const & c, colors)
     {
-        double dist = color_dist(v, colors[i]);
+        double dist = color_dist(v, c);
         if (dist < minDist)
         {
             minDist = dist;
-            result = colors[i].name_;
+            result = c.name_;
         }
     }
 

ASCOfficeOdfFile/src/common/CPString.cpp

@@ -42,7 +42,7 @@ std::string ansi_to_utf8(const std::string & _AnsiString)
 
 std::wstring utf8_to_utf16(const std::string & _Utf8String)
 {
-	return NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)_Utf8String.c_str(), (LONG)_Utf8String.length());
+	return NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)_Utf8String.c_str(), _Utf8String.length());
 }
 
 std::string utf16_to_utf8(const std::wstring & _Utf16String)

ASCOfficeOdfFile/src/docx/docx_content_type.cpp

@@ -72,10 +72,10 @@ std::wostream & override_content_type::xml_to_stream(std::wostream & _Wostream)
     return _Wostream;
 }
 
-const wchar_t * content_type::ns = L"";
-const wchar_t * content_type::name = L"Types";
+const wchar_t * content_type_content::ns = L"";
+const wchar_t * content_type_content::name = L"Types";
 
-std::wostream & content_type::xml_to_stream(std::wostream & _Wostream) const
+std::wostream & content_type_content::xml_to_stream(std::wostream & _Wostream) const
 {
     CP_XML_WRITER(_Wostream)
     {

ASCOfficeOdfFile/src/docx/docx_content_type.h

@@ -86,8 +86,8 @@ public:
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
-// content_type
-class content_type : public xml::element_impl<content_type>
+// content_type_content
+class content_type_content : public xml::element_impl<content_type_content>
 {
 public:
     static const wchar_t * ns;

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -30,6 +30,9 @@
  *
  */
 
+
+#include <boost/foreach.hpp>
+
 #include <iostream>
 
 #include <xml/utils.h>
@@ -128,15 +131,63 @@ text_tracked_context::_state & text_tracked_context::get_tracked_change(std::wst
 	else 
 		return 	current_state_; //empty
 }
+//----------------------------------------------------------------------------------------------------------------
+void text_forms_context::start_element (int type)
+{
+	current_state_.clear();
 
+	current_state_.type	= type;
+}
+void text_forms_context::set_id (const std::wstring& id)
+{
+	current_state_.id = id;
+}
+void text_forms_context::set_name (const std::wstring& name)
+{
+	current_state_.name	= name;
+}
+void text_forms_context::set_label (const std::wstring& label)
+{
+	current_state_.label = label;
+}
+void text_forms_context::set_uuid (const std::wstring& uuid)
+{
+	current_state_.uuid	= uuid;
+}
+void text_forms_context::set_value (const std::wstring &value)
+{
+	current_state_.value = value;
+}
+void text_forms_context::set_element(odf_reader::form_element *elm)
+{
+	current_state_.element = elm;
+}
+void text_forms_context::end_element ()
+{
+	mapElements_.insert( std::make_pair(current_state_.id, current_state_));
+
+	current_state_.clear();
+}
+text_forms_context::_state& text_forms_context::get_state_element (std::wstring id)
+{
+	std::map<std::wstring, _state>::iterator it = mapElements_.find(id);
+	
+	if (it != mapElements_.end())
+	{
+		return it->second;
+	}
+	else 
+		return 	current_state_; //empty
+}
 //----------------------------------------------------------------------------------------------------------------
 docx_conversion_context::docx_conversion_context(odf_reader::odf_document * OdfDocument) : 
-	last_dump_page_properties_	(true),
 	next_dump_page_properties_	(false),
 	page_break_					(false),
 	page_break_after_			(false),
 	page_break_before_			(false),
+	in_run_						(false),
 	in_automatic_style_			(false),
+	in_paragraph_				(false),
 	in_header_					(false),
 	in_drawing_content_			(false),
 	in_table_content_			(false),
@@ -147,6 +198,7 @@ docx_conversion_context::docx_conversion_context(odf_reader::odf_document * OdfD
 	new_list_style_number_		(0),
 	current_margin_left_		(0),
 	is_rtl_						(false),
+	is_paragraph_keep_			(false),
 	is_delete_text_				(false),
 	delayed_converting_			(false),
 	process_headers_footers_	(false),
@@ -156,9 +208,12 @@ docx_conversion_context::docx_conversion_context(odf_reader::odf_document * OdfD
 	odf_document_				(OdfDocument)
 {
 	streams_man_		= streams_man::create(temp_stream_);
+    applicationFonts_	= NSFonts::NSApplication::Create();
 }
 docx_conversion_context::~docx_conversion_context()
 {
+    if (applicationFonts_)
+        delete applicationFonts_;
 }
 void docx_conversion_context::set_output_document(package::docx_document * document)
 {
@@ -166,7 +221,8 @@ void docx_conversion_context::set_output_document(package::docx_document * docum
 }
 void docx_conversion_context::set_font_directory(std::wstring pathFonts)
 {
-	mediaitems_.set_font_directory(pathFonts);
+    if (applicationFonts_)
+        applicationFonts_->InitializeFromFolder(pathFonts);
 }
 std::wstring styles_map::get(const std::wstring & Name, odf_types::style_family::type Type)
 {
@@ -194,14 +250,14 @@ std::wstring styles_map::name(const std::wstring & Name, odf_types::style_family
 }
 void docx_conversion_context::add_element_to_run(std::wstring parenStyleId)
 {
-    if (!state_.in_run_)
+    if (!in_run_)
     {
-        state_.in_run_ = true;
+        in_run_ = true;
 		output_stream() << L"<w:r>";
 
-		if (!state_.text_properties_stack_.empty() || parenStyleId.length() > 0)
+		if (!text_properties_stack_.empty() || parenStyleId.length() > 0)
 		{
-			if (!state_.text_properties_stack_.empty())
+			if (!text_properties_stack_.empty())
 			{
 				odf_reader::style_text_properties_ptr textProp = this->current_text_properties();
 				get_styles_context().start();
@@ -219,36 +275,36 @@ void docx_conversion_context::add_element_to_run(std::wstring parenStyleId)
 
 void docx_conversion_context::start_paragraph(bool is_header)
 {
-	if (state_.in_paragraph_)
+	if (in_paragraph_)
 		finish_paragraph();
 
 	output_stream() << L"<w:p>";
 
 	in_header_		= is_header;
+	in_paragraph_	= true;
     is_rtl_			= false; 
 	
-	state_.in_paragraph_ = true;
 	start_changes();
 }
 
 void docx_conversion_context::finish_paragraph()
 {
-	if (state_.in_paragraph_)
+	if (in_paragraph_)
 	{
 		end_changes();
 
 		output_stream() << L"</w:p>";
 	}
 	
-	in_header_					= false;
-	state_.is_paragraph_keep_	= false;
-	state_.in_paragraph_		= false;
+	in_paragraph_		= false;
+	in_header_			= false;
+	is_paragraph_keep_	= false;
 }
 
 
 void docx_conversion_context::finish_run()
 {
-    if (false == state_.in_run_) return;
+    if (false == in_run_) return;
 
 	if (get_comments_context().state() == 4)
 	{
@@ -256,7 +312,7 @@ void docx_conversion_context::finish_run()
 		get_comments_context().state(0);
 	}
 	output_stream() << L"</w:r>";
-    state_.in_run_ = false;
+    in_run_ = false;
 	
 	if (get_comments_context().state() == 2)
 	{
@@ -329,29 +385,7 @@ void docx_conversion_context::start_index_content()
 	}
 	else
 	{
-		sInstrText += L" TOC";
-	
-		bool bLink = false, bPages = false;
-
-		if (table_content_context_.current_template.empty())
-		{
-			bLink = true;
-			bPages = true;
-		}
-		else
-		{
-			for (size_t i = 0; i < table_content_context_.current_template.size(); i++)
-			{
-				for (size_t j = 0; j < table_content_context_.current_template[i].content.size(); j++)
-				{
-					if (table_content_context_.current_template[i].content[j] == 3) bLink = true;
-					if (table_content_context_.current_template[i].content[j] == 6) bPages = true;
-				}
-			}
-		}
-
-		if (bLink)
-			sInstrText += L" \\h";
+		sInstrText += L" TOC \\h";
 
 		if (table_content_context_.type_table_content == 1)
 			sInstrText += L" \\f \\u";
@@ -365,9 +399,6 @@ void docx_conversion_context::start_index_content()
 
 			sInstrText += L" \\o \"" +	std::to_wstring(table_content_context_.min_outline_level) + L"-" + 
 										std::to_wstring(table_content_context_.max_outline_level) + L"\"";
-			if (!bPages)
-				sInstrText += L" \\n "+	std::to_wstring(table_content_context_.min_outline_level) + L"-" + 
-										std::to_wstring(table_content_context_.max_outline_level);
 		}
 		if (false == table_content_context_.outline_level_styles.empty())
 		{
@@ -387,7 +418,21 @@ void docx_conversion_context::start_index_content()
 			 sInstrText += L" \\c \"" + table_content_context_.caption_sequence_name + L"\""; 
 		}
 	}
-	start_field(sInstrText, L"");
+	output_stream() << L"<w:r>";
+	output_stream() << L"<w:fldChar w:fldCharType=\"begin\"/>";
+	output_stream() << L"</w:r>";
+	output_stream() << L"<w:r>";
+	output_stream() << L"<w:instrText xml:space=\"preserve\">" << sInstrText << L" </w:instrText>";
+	output_stream() << L"</w:r>";
+	output_stream() << L"<w:r>";
+	//output_stream() << L"<w:rPr>
+	//output_stream() << L"<w:rFonts w:ascii="Minion Pro" w:eastAsia="DejaVuSans" w:hAnsi="Minion Pro"/>
+	//output_stream() << L"<w:bCs w:val="0"/>
+	//output_stream() << L"<w:sz w:val="21"/>
+	//output_stream() << L"<w:szCs w:val="24"/>
+	//output_stream() << L"</w:rPr>
+	output_stream() << L"<w:fldChar w:fldCharType=\"separate\"/>";
+	output_stream() << L"</w:r>";
 	
 	finish_paragraph();
 }
@@ -396,51 +441,16 @@ void docx_conversion_context::end_index_content()
 	if (!in_table_content_) return;
 
 	start_paragraph(false);
-	end_field();
+	output_stream() << L"<w:r>";
+	//output_stream() << L"<w:rPr>";
+	//output_stream() << L"<w:rFonts w:ascii="Minion Pro" w:hAnsi="Minion Pro"/>";
+	//output_stream() << L"<w:sz w:val="20"/>
+	//output_stream() << L"</w:rPr>";
+	output_stream() << L"<w:fldChar w:fldCharType=\"end\"/>";
+	output_stream() << L"</w:r>";
 	
 	finish_paragraph();
 }
-void docx_conversion_context::start_field(const std::wstring & sInstrText, const std::wstring & sName)
-{
-	output_stream() << L"<w:r>";
-	output_stream() << L"<w:fldChar w:fldCharType=\"begin\">";
-
-	if (!sName.empty())
-	{
-		output_stream() << L"<w:ffData><w:name w:val=\"" << sName << L"\"/><w:enabled/><w:calcOnExit w:val=\"0\"/></w:ffData>";
-	}
-	output_stream() << L"</w:fldChar>";
-	output_stream() << L"</w:r>";
-	output_stream() << L"<w:r>";
-	output_stream() << L"<w:instrText xml:space=\"preserve\">" << XmlUtils::EncodeXmlString(sInstrText) << L" </w:instrText>";
-	output_stream() << L"</w:r>";
-	output_stream() << L"<w:r>";
-
-	output_stream() << L"<w:fldChar w:fldCharType=\"separate\"/>";
-	output_stream() << L"</w:r>";
-
-	if (!sName.empty())
-	{
-		start_bookmark(sName);
-	}
-	fields_names_stack_.push_back(sName);
-}
-void docx_conversion_context::end_field()
-{
-	if (fields_names_stack_.empty()) return;
-
-	output_stream() << L"<w:r>";
-	output_stream() << L"<w:fldChar w:fldCharType=\"end\"/>";
-	output_stream() << L"</w:r>";	
-
-	std::wstring sName = fields_names_stack_.back();
-	fields_names_stack_.pop_back();
-
-	if (!sName.empty())
-	{
-		end_bookmark(sName);
-	}
-}
 void docx_conversion_context::end_sdt()
 {
 	if (!in_table_content_) return;
@@ -480,7 +490,7 @@ void docx_conversion_context::start_bookmark (const std::wstring &name)
 	}
 
 	finish_run();
-	output_stream() << L"<w:bookmarkStart w:id=\"" << std::to_wstring(id) << L"\" w:name=\"" << XmlUtils::EncodeXmlString(name) << L"\"/>";
+	output_stream() << L"<w:bookmarkStart w:id=\"" << std::to_wstring(id) << L"\" w:name=\"" << name << L"\"/>";
 }
 
 void docx_conversion_context::end_bookmark (const std::wstring &name)
@@ -578,27 +588,6 @@ oox_chart_context & docx_conversion_context::current_chart()
         throw std::runtime_error("internal error");
     }
 }
-void docx_conversion_context::reset_context_state()
-{
-	keep_state_.push_back(state_);
-	
-	state_.in_paragraph_		= false;
-	state_.in_run_				= false;
-	state_.is_paragraph_keep_	= false;
-	
-	state_.drawing_text_props_.clear();	
-	state_.text_properties_stack_.clear();
-	
-	get_styles_context().text_style_ext().clear();
-}
-void docx_conversion_context::back_context_state()
-{
-	state_ = keep_state_.back();
-	keep_state_.pop_back();
-
-	get_styles_context().text_style_ext().clear();
-}
-
 void docx_conversion_context::add_new_run(std::wstring parentStyleId)
 {
 	finish_run();
@@ -683,7 +672,7 @@ void docx_conversion_context::end_document()
 
     output_document_->get_word_files().set_document	( package::simple_element::create(L"document.xml", document_xml_.str()) );
 	output_document_->get_word_files().set_settings	( package::simple_element::create(L"settings.xml", dump_settings_document()));
-	output_document_->get_word_files().set_media	( mediaitems_);
+	output_document_->get_word_files().set_media	( mediaitems_, applicationFonts_);
 	output_document_->get_word_files().set_comments	( comments_context_);
     output_document_->get_word_files().set_headers_footers( headers_footers_);
 
@@ -903,24 +892,22 @@ xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\"
 mc:Ignorable=\"w14 wp14\">";
 
     std::vector<int> numIds;
-
-	odf_reader::list_style_container::instances_array & arListStyles = list_styles.instances();
-	for (size_t i = 0; i < arListStyles.size(); i++)
-   {
-        odf_reader::office_element_ptr_array & content = arListStyles[i]->get_text_list_style()->get_content();
+	BOOST_FOREACH(odf_reader::list_style_instance_ptr & inst, list_styles.instances())
+    {
+        odf_reader::office_element_ptr_array & content = inst->get_text_list_style()->get_content();
 
 		if (content.size() < 1) 
 			continue;
        
-		const int abstractNumId = list_styles.id_by_name(arListStyles[i]->get_style_name());
+		const int abstractNumId = list_styles.id_by_name(inst->get_style_name());
         
         strm << L"<w:abstractNum w:abstractNumId=\"" << abstractNumId << "\">";
         numIds.push_back(abstractNumId);		
        
-        for (size_t j = 0; j < (std::min)( content.size(), (size_t)9); j++)
+		for (size_t i = 0; i < (std::min)( content.size(), (size_t)9); i++)
         {
-            start_text_list_style(arListStyles[i]->get_text_list_style()->get_style_name());
-            content[j]->docx_convert(*this);
+            start_text_list_style(inst->get_text_list_style()->get_style_name());
+            content[i]->docx_convert(*this);
             // TODO
             end_text_list_style();        
         }
@@ -951,25 +938,21 @@ void docx_conversion_context::process_fonts()
         odf_reader::odf_read_context & context =  doc->odf_context();
         odf_reader::fonts_container & fonts = context.fontContainer();
 
-		odf_reader::fonts_container::instances_array &arFonts = fonts.instances();
-		for (size_t i = 0; i < arFonts.size(); i++)
+        BOOST_FOREACH(odf_reader::font_instance_ptr & inst, fonts.instances())
         {
-			if (!arFonts[i]) continue;
-			if (arFonts[i]->name().empty()) continue;
+            strm << L"<w:font w:name=\"" << inst->name() << L"\" >";
 
-            strm << L"<w:font w:name=\"" << arFonts[i]->name() << L"\" >";
+            if (!inst->charset().empty())
+                strm << L"<w:charset w:val=\"" << inst->charset() <<"\" />";
 
-            if (!arFonts[i]->charset().empty())
-                strm << L"<w:charset w:val=\"" << arFonts[i]->charset() <<"\" />";
+            if (!inst->family().empty())
+                strm << L"<w:family w:val=\"" << inst->family() << "\" />";
 
-            if (!arFonts[i]->family().empty())
-                strm << L"<w:family w:val=\"" << arFonts[i]->family() << "\" />";
+            if (!inst->pitch().empty())
+                strm << L"<w:pitch w:val=\"" << inst->pitch() << "\" />";
 
-            if (!arFonts[i]->pitch().empty())
-                strm << L"<w:pitch w:val=\"" << arFonts[i]->pitch() << "\" />";
-
-            if (!arFonts[i]->alt_name().empty())
-                strm << L"<w:altName w:val=\"" << arFonts[i]->alt_name() << "\" />";
+            if (!inst->alt_name().empty())
+                strm << L"<w:altName w:val=\"" << inst->alt_name() << "\" />";
 
             strm << L"</w:font>";
         }
@@ -1000,11 +983,9 @@ void docx_conversion_context::process_styles()
         odf_reader::styles_container & styles = context.styleContainer();
 
         // add all styles to the map
-		odf_reader::styles_container::instances_array &arStyles = styles.instances();
-		for (size_t i = 0; i < arStyles.size(); i++)
+        BOOST_FOREACH(odf_reader::style_instance_ptr & inst, styles.instances())
         {
-			if (!arStyles[i]) continue;
-            styles_map_.get(arStyles[i]->name(), arStyles[i]->type());
+            styles_map_.get(inst->name(), inst->type());
         }
 
         _Wostream << L"<w:docDefaults>";
@@ -1014,86 +995,60 @@ void docx_conversion_context::process_styles()
             _Wostream << L"<w:pPrDefault>";
             if ( odf_reader::style_content * content = defaultParStyle->content())
             {
-				if (content->get_style_paragraph_properties())
-				{
-					if(content->get_style_paragraph_properties()->content_.fo_background_color_)
-					{
-						odf_types::background_color color = *content->get_style_paragraph_properties()->content_.fo_background_color_;
-						if ((color.get_type() != odf_types::background_color::Transparent && 
-							color.get_color() == odf_types::color(L"ffffff")) ||
-							(color.get_type() == odf_types::background_color::Transparent))
-						{
-							content->get_style_paragraph_properties()->content_.fo_background_color_ = boost::none;
-						}
-					}
-				}
                 get_styles_context().start_process_style(defaultParStyle);
                 content->docx_convert(*this);
 				get_styles_context().end_process_style();
 			}
             _Wostream << L"</w:pPrDefault>";
         }
-        if (odf_reader::style_instance * defaultParStyle = styles.style_default_by_type(odf_types::style_family::Text))
-        {
-            _Wostream << L"<w:rPrDefault>";
-            if ( odf_reader::style_content * content = defaultParStyle->content())
-            {
-                get_styles_context().start_process_style(defaultParStyle);
-                content->docx_convert(*this);
-				get_styles_context().end_process_style();
-			}
-            _Wostream << L"</w:rPrDefault>";
-        }
+
         _Wostream << L"</w:docDefaults>";
 
-		for (size_t i = 0; i < arStyles.size(); i++)
-		{
-            if (!arStyles[i]->is_automatic() && 
+        BOOST_FOREACH(odf_reader::style_instance_ptr & inst, styles.instances())
+        {
+            if (!inst->is_automatic() && 
 					(
-					arStyles[i]->type() == odf_types::style_family::Paragraph ||
-					arStyles[i]->type() == odf_types::style_family::Text
+					inst->type() == odf_types::style_family::Paragraph ||
+					inst->type() == odf_types::style_family::Text
 					))
             {
-                const std::wstring id = styles_map_.get(arStyles[i]->name(), arStyles[i]->type());
-                _Wostream << L"<w:style w:styleId=\"" << id << L"\" w:type=\"" << StyleTypeOdf2Docx(arStyles[i]->type()) << L"\""; 
-				if (!arStyles[i]->is_default())
+                const std::wstring id = styles_map_.get(inst->name(), inst->type());
+                _Wostream << L"<w:style w:styleId=\"" << id << L"\" w:type=\"" << StyleTypeOdf2Docx(inst->type()) << L"\""; 
+				if (!inst->is_default())
 				{
 					_Wostream << L" w:customStyle=\"1\"";
 				}
 				_Wostream << L">";
 
-                const std::wstring displayName = StyleDisplayName(arStyles[i]->name(), arStyles[i]->type());
+                const std::wstring displayName = StyleDisplayName(inst->name(), inst->type());
 
                 _Wostream << L"<w:name w:val=\"" << displayName << L"\" />";
 
-                if (odf_reader::style_instance * baseOn = arStyles[i]->parent())
+                if (odf_reader::style_instance * baseOn = inst->parent())
                 {
                     const std::wstring basedOnId = styles_map_.get(baseOn->name(), baseOn->type());
                     _Wostream << L"<w:basedOn w:val=\"" << basedOnId << "\" />";
                 }
-                else if (!arStyles[i]->is_default() && styles_map_.check(L"", arStyles[i]->type()))
+                else if (!inst->is_default() && styles_map_.check(L"", inst->type()))
                 {
-                    const std::wstring basedOnId = styles_map_.get(L"", arStyles[i]->type());
+                    const std::wstring basedOnId = styles_map_.get(L"", inst->type());
                     _Wostream << L"<w:basedOn w:val=\"" << basedOnId << "\" />";
                 }
 
-                if (odf_reader::style_instance * next = arStyles[i]->next())
+                if (odf_reader::style_instance * next = inst->next())
                 {
                     const std::wstring nextId = styles_map_.get(next->name(), next->type());
                     _Wostream << L"<w:next w:val=\"" << nextId << "\" />";
                 }
-                else if (arStyles[i]->is_default())
+                else if (inst->is_default())
                 {
                     // self
                     _Wostream << L"<w:next w:val=\"" << id << "\" />";
                 }
 
-                if (odf_reader::style_content * content = arStyles[i]->content())
+                if (odf_reader::style_content * content = inst->content())
                 {
-					get_tabs_context().clear();
-					calc_tab_stops(arStyles[i].get(), get_tabs_context());
-					
-					get_styles_context().start_process_style(arStyles[i].get());
+                    get_styles_context().start_process_style(inst.get());
                     content->docx_convert(*this, true);
                     get_styles_context().end_process_style();
                 }
@@ -1343,22 +1298,21 @@ bool docx_conversion_context::in_automatic_style()
 
 void docx_conversion_context::push_text_properties(const odf_reader::style_text_properties * TextProperties)
 {
-    state_.text_properties_stack_.push_back(TextProperties);
+    text_properties_stack_.push_back(TextProperties);
 }
 
 void docx_conversion_context::pop_text_properties()
 {
-    state_.text_properties_stack_.pop_back();
+    text_properties_stack_.pop_back();
 }
 
 odf_reader::style_text_properties_ptr docx_conversion_context::current_text_properties()
 {
     odf_reader::style_text_properties_ptr cur = boost::make_shared<odf_reader::style_text_properties>();
-
-	for (size_t i = 0; i < state_.text_properties_stack_.size(); i++)
+    BOOST_FOREACH(const odf_reader::style_text_properties * prop, text_properties_stack_)
     {
-        if (state_.text_properties_stack_[i])
-            cur->content().apply_from( state_.text_properties_stack_[i]->content() );
+        if (prop)
+            cur->content().apply_from( prop->content() );
     }
     return cur;
 }
@@ -1426,22 +1380,14 @@ void docx_conversion_context::next_dump_page_properties(bool val)
 	if (process_headers_footers_ && val) return;
 		
 	next_dump_page_properties_ = val;
-	if (val)
-		last_dump_page_properties(true);
 }
 
 bool docx_conversion_context::is_next_dump_page_properties()
 {
     return next_dump_page_properties_;    
 }
-void docx_conversion_context::last_dump_page_properties(bool val)
-{
-	last_dump_page_properties_ = val;
-}
-bool docx_conversion_context::is_last_dump_page_properties()
-{
-    return last_dump_page_properties_;    
-}
+
+
 void docx_conversion_context::start_text_list_style(const std::wstring & StyleName)
 {
     text_list_style_name_ = StyleName;    
@@ -1574,7 +1520,7 @@ int docx_conversion_context::process_paragraph_attr(odf_reader::text::paragraph_
 
                     start_automatic_style(id);
 
-					calc_tab_stops(styleInst, get_tabs_context());
+					odf_reader::calc_tab_stops(styleInst, get_tabs_context());
 					
 					//вытаскивает rtl c цепочки стилей !! - просто прописать в наследуемом НЕЛЬЗЯ !!
 					odf_reader::paragraph_format_properties properties = odf_reader::calc_paragraph_properties_content(styleInst);
@@ -1613,31 +1559,15 @@ int docx_conversion_context::process_paragraph_attr(odf_reader::text::paragraph_
 
 							output_stream() << L"</w:pPr>";
 							finish_paragraph();
-							start_paragraph();
-							if ((Attr->outline_level_) && (*Attr->outline_level_ > 0))
-							{
-								output_stream() << L"<w:pPr>";
-									output_stream() << L"<w:outlineLvl w:val=\"" << *Attr->outline_level_ - 1 << L"\"/>";
-								output_stream() << L"</w:pPr>";
-							}					
+							start_paragraph();					
 						}
 						else
 						{
 							output_stream() << get_section_context().dump_;
 							get_section_context().dump_.clear();
-							if ((Attr->outline_level_) && (*Attr->outline_level_ > 0))
-							{
-								output_stream() << L"<w:outlineLvl w:val=\"" << *Attr->outline_level_ - 1 << L"\"/>";
-							}
 							output_stream() << L"</w:pPr>";
 						}
 					}
-					else if ((Attr->outline_level_) && (*Attr->outline_level_ > 0))
-					{
-						output_stream() << L"<w:pPr>";
-							output_stream() << L"<w:outlineLvl w:val=\"" << *Attr->outline_level_ - 1 << L"\"/>";
-						output_stream() << L"</w:pPr>";
-					}
 					return 1;
                 }            
             }
@@ -1766,11 +1696,6 @@ void docx_conversion_context::serialize_list_properties(std::wostream & strm)
     }
 }
 
-void docx_conversion_context::set_drawing_text_props (const std::wstring &props)
-{
-	get_styles_context().text_style_ext() = props;
-}
-
 void docx_conversion_context::add_delayed_element(odf_reader::office_element * Elm)
 {
    delayed_elements_.push_back(Elm);    
@@ -1804,7 +1729,10 @@ namespace
 {
     // обработка Header/Footer
     // конвертируем содержимое header/footer и сохраняем результат в виде строки
-    void process_one_header_footer(docx_conversion_context & Context, const std::wstring & styleName, odf_reader::office_element *elm, headers_footers::Type type)
+    void process_one_header_footer(docx_conversion_context & Context,
+        const std::wstring & styleName,
+        odf_reader::office_element * elm,
+        headers_footers::Type type)
     {
         if (!elm) return;
         
@@ -1822,7 +1750,13 @@ namespace
 		Context.dump_hyperlinks(internal_rels, hyperlinks::document_place);
 
 		Context.get_headers_footers().add(styleName, dbgStr, type, internal_rels);
-	}
+
+		if (type == headers_footers::headerLeft || type == headers_footers::footerLeft)
+		{
+			Context.set_settings_property(odf_reader::_property(L"evenAndOddHeaders",true));
+		}
+   }
+
 }
 void docx_conversion_context::set_settings_property(const odf_reader::_property & prop)
 {
@@ -1844,39 +1778,21 @@ void docx_conversion_context::process_headers_footers()
     odf_reader::page_layout_container & pageLayouts = context.pageLayoutContainer();
 
     // проходим по всем page layout
-	std::vector<odf_reader::style_master_page*> & master_pages = pageLayouts.master_pages();
-
-	bool bOddEvenPages = false;
-	for (size_t i = 0; i < master_pages.size(); i++)
-	{
-		if (master_pages[i]->style_header_left_ || master_pages[i]->style_footer_left_)
-			bOddEvenPages = true;
-	}
-	if (bOddEvenPages)
-	{
-		set_settings_property(odf_reader::_property(L"evenAndOddHeaders", true));
-	}
- 	for (size_t i = 0; i < master_pages.size(); i++)
-	{
-        const std::wstring & styleName = master_pages[i]->attlist_.style_name_.get_value_or( L"" );
+    BOOST_FOREACH(const odf_reader::style_master_page* page, pageLayouts.master_pages())
+    {
+        const std::wstring & styleName = page->attlist_.style_name_.get_value_or( L"" );
         const std::wstring masterPageNameLayout =context.pageLayoutContainer().page_layout_name_by_style(styleName);
-       
-		add_page_properties(masterPageNameLayout);
+        add_page_properties(masterPageNameLayout);
 		
-		process_one_header_footer(*this, styleName, master_pages[i]->style_header_.get(),		headers_footers::header);
-        process_one_header_footer(*this, styleName, master_pages[i]->style_footer_.get(),		headers_footers::footer );
-        process_one_header_footer(*this, styleName, master_pages[i]->style_header_first_.get(),	headers_footers::headerFirst);
-        process_one_header_footer(*this, styleName, master_pages[i]->style_footer_first_.get(),	headers_footers::footerFirst );
-        process_one_header_footer(*this, styleName, master_pages[i]->style_header_left_.get(),	headers_footers::headerLeft );
-        process_one_header_footer(*this, styleName, master_pages[i]->style_footer_left_.get(),	headers_footers::footerLeft );
+		process_one_header_footer(*this, styleName, page->style_header_.get(), headers_footers::header);
+        process_one_header_footer(*this, styleName, page->style_footer_.get(), headers_footers::footer );
+        process_one_header_footer(*this, styleName, page->style_header_first_.get(), headers_footers::headerFirst);
+        process_one_header_footer(*this, styleName, page->style_footer_first_.get(), headers_footers::footerFirst );
+        process_one_header_footer(*this, styleName, page->style_header_left_.get(), headers_footers::headerLeft );
+        process_one_header_footer(*this, styleName, page->style_footer_left_.get(), headers_footers::footerLeft );
 
-		if (bOddEvenPages && !master_pages[i]->style_header_left_)
-			process_one_header_footer(*this, styleName, master_pages[i]->style_header_.get(),	headers_footers::headerLeft);
-		if (bOddEvenPages && !master_pages[i]->style_footer_left_)
-			process_one_header_footer(*this, styleName, master_pages[i]->style_footer_.get(),	headers_footers::footerLeft );
-
-		if (!master_pages[i]->style_header_ && !master_pages[i]->style_footer_ && !master_pages[i]->style_header_first_ && !master_pages[i]->style_footer_first_
-			&& !master_pages[i]->style_header_left_ && !master_pages[i]->style_footer_left_)
+		if (!page->style_header_ && !page->style_footer_ && !page->style_header_first_ && !page->style_footer_first_
+			&& !page->style_header_left_ && !page->style_footer_left_)
 		{
 			//отключенные колонтитулы
 			rels rels_;
@@ -1946,7 +1862,7 @@ void docx_conversion_context::start_text_changes (const std::wstring &id)
 	
 	map_current_changes_.insert(std::pair<std::wstring, text_tracked_context::_state> (id, state_add));
 
-	if (state_.in_paragraph_ && ( state_add.type == 1 || state_add.type == 2 ))
+	if (in_paragraph_ && ( state_add.type == 1 || state_add.type == 2 ))
 	{
 		map_changes_iterator it = map_current_changes_.find(id);
 		text_tracked_context::_state  &state = it->second;
@@ -2118,7 +2034,7 @@ void docx_conversion_context::end_text_changes (const std::wstring &id)
 	
 	if (state.active)
 	{
-		if (state_.in_paragraph_)
+		if (in_paragraph_)
 			finish_run();
 		
 		if (state.type	== 1)	output_stream() << L"</w:ins>";
@@ -2139,13 +2055,5 @@ std::wstring docx_conversion_context::get_user_field(const std::wstring & name)
 	return pFind != map_user_fields.end() ? pFind->second : L"";
 }
 
-void docx_conversion_context::add_jsaProject(const std::string &content)
-{
-	if (content.empty()) return;
-	
-	output_document_->get_word_files().add_jsaProject(content);
-	output_document_->get_content_types_file().add_or_find_default(L"bin");
-}
-
 }
 }

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -47,6 +47,8 @@
 #include "hyperlinks.h"
 #include "mediaitems.h"
 
+#include "../../../DesktopEditor/graphics/pro/Fonts.h"
+
 namespace cpdoccore { 
 
 	namespace odf_types
@@ -188,14 +190,14 @@ public:
     }
 	void set_position_child_group(_INT32 x, _INT32 y)
 	{
-		if (groups_.empty()) return;
+		if (groups_.size() < 1) return;
 
 		if (groups_.back().x > x)	groups_.back().x = x;
 		if (groups_.back().y > y)	groups_.back().y = y;
 	}	
 	void set_size_child_group(_INT32 cx, _INT32 cy)
 	{
-		if (groups_.empty()) return;
+		if (groups_.size() < 1) return;
 
 		if (groups_.back().cx < cx)	groups_.back().cx = cx;
 		if (groups_.back().cy < cy)	groups_.back().cy = cy;
@@ -203,7 +205,7 @@ public:
 	void get_position_group(_INT32 & x, _INT32 & y)
 	{
 		x = y = 0;
-		if (groups_.empty()) return;
+		if (groups_.size() < 1) return;
 
 		x = groups_.back().x;
 		y = groups_.back().y;
@@ -211,7 +213,7 @@ public:
 	void get_size_group(_INT32 & cx, _INT32 & cy)
 	{
 		cx = cy = 0;
-		if (groups_.empty()) return;
+		if (groups_.size() < 1) return;
 
 		cx = groups_.back().cx;
 		cy = groups_.back().cy;
@@ -570,6 +572,47 @@ private:
 	std::map<std::wstring, _state>	mapChanges_;
 };
 
+class text_forms_context
+{
+public:
+	struct _state
+	{
+		std::wstring				id;
+		std::wstring				name;
+		int							type = 0; //enum?
+		std::wstring				label;
+		std::wstring				uuid;
+		std::wstring				value;
+		odf_reader::form_element*	element = NULL;
+	
+		void clear()
+		{
+			type = 0;
+			id.clear();
+			name.clear();
+			label.clear();
+			value.clear();
+			uuid.clear();
+			element = NULL;
+		}
+	};
+	text_forms_context(){}
+
+	void start_element	(int type);
+		void set_id		(const std::wstring& id);
+		void set_name	(const std::wstring& name);
+		void set_label	(const std::wstring& label);
+		void set_uuid	(const std::wstring& uuid);
+		void set_value	(const std::wstring& value);
+		void set_element(odf_reader::form_element *elm);
+	void end_element	();
+
+	_state& get_state_element (std::wstring id);
+
+private:
+	_state							current_state_;
+	std::map<std::wstring, _state>	mapElements_;
+};
 class table_content_context
 {
 public:
@@ -625,7 +668,7 @@ public:
 	{
 		current_state.content.push_back(type);
 	}	
-	void add_outline_level_style(const std::wstring& style_name, int level)
+	void add_outline_level_style(int level, const std::wstring& style_name)
 	{
 		if (min_outline_level == -1 || min_outline_level > level)
 			min_outline_level = level;
@@ -640,15 +683,13 @@ public:
 	}
 	void end_level()
 	{
-		current_template.push_back(current_state);
-
-		map_current_template.insert(std::make_pair(current_state.name, current_state));
+		current_template.insert(std::make_pair(current_state.name, current_state));
 		current_state.clear();
 	}
 	void set_current_level(const std::wstring &name)
 	{
-		std::map<std::wstring, _state>::iterator pFind = map_current_template.find(name);
-		if (pFind == map_current_template.end())
+		std::map<std::wstring, _state>::iterator pFind = current_template.find(name);
+		if (pFind == current_template.end())
 		{
 			current_content_template_.clear();
 		}
@@ -685,7 +726,6 @@ public:
 		current_content_template_index_ = 0;
 		current_content_template_.clear();
 		current_template.clear();
-		map_current_template.clear();
 		current_state.clear();
 		caption_sequence_name.clear();
 		min_outline_level = -1;
@@ -717,13 +757,12 @@ public:
 	int								max_outline_level;
 	std::map<int, std::wstring>		outline_level_styles;
 	bool							bSeparators;
-	std::vector<_state>				current_template;
 
 private:
 	std::vector<int>				current_content_template_;
 	int								current_content_template_index_;
 
-	std::map<std::wstring, _state>	map_current_template;
+	std::map<std::wstring, _state>	current_template;
 	_state							current_state;
 	//std::map<std::wstring, int>	sequences;
 	std::vector<std::wstring>		sequences;
@@ -754,7 +793,9 @@ public:
 
 	void add_element_to_run		(std::wstring parenStyleId = _T(""));
     void finish_run				();
-	void add_new_run			(std::wstring parentStyleId = _T(""));    
+	void add_new_run			(std::wstring parentStyleId = _T(""));
+    bool get_run_state			()			{ return in_run_; }
+    void set_run_state			(bool Val)	{ in_run_			= Val; }
   
     void start_paragraph		(bool is_header = false);
     void finish_paragraph		();
@@ -762,18 +803,10 @@ public:
 	bool is_alphabetical_index	()					{ return false == mapAlphabeticals.empty();}
 	bool is_table_content		()					{ return in_table_content_; }
 	bool is_paragraph_header	()					{ return in_header_;		}
-	
-	void reset_context_state();
-	void back_context_state();
-	
-	bool get_run_state			()					{ return state_.in_run_; }
-    void set_run_state			(bool Val)			{ state_.in_run_ = Val; }
-	
-	bool get_paragraph_state	()					{ return state_.in_paragraph_;		}
-    void set_paragraph_state	(bool val)			{ state_.in_paragraph_	= val;		}
-	
-	bool get_paragraph_keep		()					{ return state_.is_paragraph_keep_;}
-	void set_paragraph_keep		(bool val)			{ state_.is_paragraph_keep_ = val;	}
+	bool get_paragraph_state	()					{ return in_paragraph_;		}
+    void set_paragraph_state	(bool val)			{ in_paragraph_	= val;		}
+	bool get_paragraph_keep		()					{ return is_paragraph_keep_;}
+	void set_paragraph_keep		(bool val)			{ is_paragraph_keep_ = val;	}
 
 	bool get_delete_text_state	()					{ return is_delete_text_;	}
 	void set_delete_text_state	(bool Val)			{ is_delete_text_ = Val;	}
@@ -793,20 +826,20 @@ public:
 
  	bool next_dump_page_properties_;
 	bool next_dump_section_;
-	bool last_dump_page_properties_;
 
-    odf_reader::odf_document *root()
+    odf_reader::odf_document * root()
     {
         return odf_document_;
     }
+
     void start_document	();
     void end_document	();
 
     void start_body		();
     void end_body		();
     
-	void start_office_text	();
-    void end_office_text	();
+	void start_office_text		();
+    void end_office_text		();
 
 	void start_sdt	(int type);
 	void end_sdt	();
@@ -817,9 +850,6 @@ public:
 	void start_index_element();
 	void end_index_element();
 
-	void start_field(const std::wstring & sInstrText, const std::wstring & sName);
-	void end_field();
-
 	void process_styles			();
     void process_fonts			();
     
@@ -863,8 +893,6 @@ public:
     
 	void next_dump_page_properties			(bool val);
     bool is_next_dump_page_properties		();
-	void last_dump_page_properties			(bool val);
-	bool is_last_dump_page_properties		();
 
     void set_master_page_name(const std::wstring & MasterPageName);
     const std::wstring & get_master_page_name() const;
@@ -895,13 +923,11 @@ public:
 	section_context		& get_section_context()		{ return section_context_; }
 	notes_context		& get_notes_context()		{ return notes_context_; }
 	text_tracked_context& get_text_tracked_context(){ return text_tracked_context_; }
-	forms_context		& get_forms_context()		{ return forms_context_; }
+	text_forms_context	& get_forms_context()		{ return text_forms_context_; }
 	tabs_context		& get_tabs_context()		{ return tabs_context_;}
 	
 	table_content_context	& get_table_content_context()	{ return table_content_context_;}
 
-	void set_drawing_text_props (const std::wstring &props);
-
     void docx_convert_delayed	();
     void add_delayed_element	(odf_reader::office_element * Elm);
 
@@ -942,34 +968,20 @@ public:
 	void add_alphabetical_index_text (odf_reader::office_element_ptr & elem);
 
 	void set_process_headers_footers(bool Val)				{ process_headers_footers_ = Val; }
-   
-	headers_footers			& get_headers_footers()			{ return headers_footers_; }
+    headers_footers			& get_headers_footers()			{ return headers_footers_; }
 	header_footer_context	& get_header_footer_context()	{ return header_footer_context_; }
-	drop_cap_context		& get_drop_cap_context()		{return drop_cap_context_;}
+
+	drop_cap_context & get_drop_cap_context(){return drop_cap_context_;}
 	
-	styles_map	styles_map_;
-	bool		process_headers_footers_;
-	bool		delayed_converting_;
-	bool		convert_delayed_enabled_;
+	styles_map				styles_map_;
+	bool					process_headers_footers_;
+	bool					delayed_converting_;
+	bool					convert_delayed_enabled_;
 
-	void		start_changes();
-	void		end_changes();
+	void					start_changes();
+	void					end_changes();
 
-	void		add_jsaProject(const std::string &content);
 private:
-
-	struct _context_state
-	{
-		bool in_paragraph_ = false;
-		bool in_run_ = false;
-		bool is_paragraph_keep_ = false; 
-
-		std::wstring drawing_text_props_;
-
-		std::vector< const odf_reader::style_text_properties*> text_properties_stack_;
-	}state_;
-	std::vector<_context_state> keep_state_;
-	
 	std::wstringstream		document_xml_;
     std::wstringstream		styles_xml_;
     std::wstringstream		fontTable_xml_;
@@ -992,7 +1004,7 @@ private:
     header_footer_context	header_footer_context_;
     notes_context			notes_context_;
 	text_tracked_context	text_tracked_context_;
-	forms_context			forms_context_;
+	text_forms_context		text_forms_context_;
 	tabs_context			tabs_context_;
 	table_content_context	table_content_context_;
        
@@ -1000,6 +1012,7 @@ private:
 
     package::docx_document		* output_document_;
     odf_reader::odf_document	* odf_document_;
+    NSFonts::IApplicationFonts	* applicationFonts_;
 
 	std::vector<odf_reader::_property>		settings_properties_;
 
@@ -1011,11 +1024,8 @@ private:
     std::wstring			automatic_parent_style_; 
     std::wstring			current_master_page_name_;
 	std::wstring			text_list_style_name_;
-
     std::vector<std::wstring> list_style_stack_;
-	std::vector<std::wstring> fields_names_stack_;
-    
-	bool					first_element_list_item_;
+    bool					first_element_list_item_;
     
 	bool page_break_after_;
     bool page_break_before_;
@@ -1024,10 +1034,12 @@ private:
 	bool in_automatic_style_; 
 	bool in_drawing_content_;
 	bool in_table_content_;
-
+    bool in_paragraph_;
+	bool in_run_;
 	bool in_header_;
 	bool is_delete_text_;
     bool is_rtl_; // right-to-left
+    bool is_paragraph_keep_; 
  
 	std::wstring current_alphabetic_index_;
 	int current_margin_left_;
@@ -1036,6 +1048,7 @@ private:
     
 	std::vector<odf_reader::office_element*>							delayed_elements_;
 
+    std::vector< const odf_reader::style_text_properties*>				text_properties_stack_;
 	std::map<std::wstring, text_tracked_context::_state>				map_current_changes_;    
     boost::unordered_map<std::wstring, std::wstring>					list_style_renames_;// цепочки переименований нумераций
 	

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -231,7 +231,7 @@ void docx_serialize_image_child(std::wostream & strm, _docx_drawing & val)
 					CP_XML_NODE(L"a:avLst");
 				}
 
-				oox_serialize_ln(CP_XML_STREAM(), val.additional);
+				oox_serialize_ln(CP_XML_STREAM(),val.additional);
 			}
 		}
 	}

ASCOfficeOdfFile/src/docx/docx_package.cpp

@@ -124,12 +124,6 @@ void word_files::write(const std::wstring & RootPath)
         charts_files_.set_main_document(get_main_document());
         charts_files_.write(path);
     }
-
-	if (jsaProject_)
-	{
-		rels_files_.add( relationship(L"jsaId", L"http://schemas.onlyoffice.com/jsaProject", L"jsaProject.bin" ) );
-		jsaProject_->write( path );
-	}
    
 	if (notes_)
     {
@@ -147,11 +141,11 @@ void word_files::update_rels(docx_conversion_context & Context)
     Context.dump_notes			(rels_files_.get_rel_file()->get_rels());
 }
 
-void word_files::set_media(mediaitems & _Mediaitems)
+void word_files::set_media(mediaitems & _Mediaitems, NSFonts::IApplicationFonts *pAppFonts)
 {
 	if (_Mediaitems.count_image + _Mediaitems.count_media > 0)
 	{
-		media_ = element_ptr( new media(_Mediaitems, _Mediaitems.applicationFonts()) );
+		media_		= element_ptr( new media(_Mediaitems, pAppFonts) );
 	}
 	if (_Mediaitems.count_object > 0)
 	{
@@ -191,10 +185,7 @@ bool word_files::has_numbering()
 { 
     return numbering_ ? true : false;
 }
-void word_files::add_jsaProject(const std::string &content)
-{
-	jsaProject_ = package::simple_element::create(L"jsaProject.bin", content);
-}
+
 void word_files::set_headers_footers(headers_footers & HeadersFooters)
 {
     headers_footers_elements * elm = new headers_footers_elements(HeadersFooters); 
@@ -243,7 +234,7 @@ void customXml_files::write(const std::wstring & RootPath)
 		const std::wstring fileNameItem = std::wstring(L"item") + std::to_wstring(i+1) + L".xml";
 		const std::wstring fileNameProps = std::wstring(L"itemProps") + std::to_wstring(i+1) + L".xml";
        
-		content_type * contentTypes = get_main_document()->get_content_types_file().content();           
+		content_type_content * contentTypes = get_main_document()->get_content_types_file().content();           
         contentTypes->add_override(std::wstring(L"/customXml/") + fileNameProps, 
 							L"application/vnd.openxmlformats-officedocument.customXmlProperties+xml");
 
@@ -280,7 +271,7 @@ void docx_charts_files::write(const std::wstring & RootPath)
         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 * contentTypes = get_main_document()->get_content_types_file().content();           
+		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, charts_[i]->str()).write(path);

ASCOfficeOdfFile/src/docx/docx_package.h

@@ -40,6 +40,8 @@
 #include "docx_content_type.h"
 #include "oox_package.h"
 
+#include "../../../DesktopEditor/graphics/pro/Fonts.h"
+
 namespace cpdoccore { 
 namespace oox {
     
@@ -137,13 +139,12 @@ public:
     void set_numbering	(element_ptr Element);
     void set_settings	(element_ptr Element);
     bool has_numbering	();
-    void set_media			(mediaitems			& mediaitems_);
+    void set_media			(mediaitems			& _Mediaitems, NSFonts::IApplicationFonts *pAppFonts);
     void set_headers_footers(headers_footers	& HeadersFooters);
     void set_notes			(notes_context		& notesContext);
     void set_comments		(comments_context	& commentsContext);
 
 	void add_charts(chart_content_ptr chart);
-	void add_jsaProject(const std::string &content);
 
 	void add_rels(relationship const & r);
 
@@ -162,7 +163,6 @@ private:
     element_ptr notes_;
     element_ptr settings_;
     element_ptr comments_;
-    element_ptr jsaProject_;
 
 };
 

ASCOfficeOdfFile/src/docx/docx_table_context.cpp

@@ -94,16 +94,8 @@ std::wstring docx_table_state::current_row_style() const
 
 double docx_table_state::get_current_cell_width()
 {
-	if (current_table_column_ + columns_spanned_num_ < columns_width_.size())
-	{
-		//return columns_width_[current_table_column_];
-		double res = 0;
-		for (unsigned int i = 0; i < columns_spanned_num_ + 1; i++)
-		{
-			res += columns_width_[current_table_column_ + i];
-		}
-		return res;
-	}
+	if (current_table_column_ < columns_width_.size())
+		return columns_width_[current_table_column_];
 	else
 		return 0;
 }

ASCOfficeOdfFile/src/docx/drawing_object_description.h

@@ -73,8 +73,7 @@ struct drawing_object_description
 	_oox_fill								fill_;
 
 	bool									in_group_;
-	bool									lined_;
-	bool									connector_;
+
 	int										shape_type_;	//default - frame
 
 	std::vector<drawing_object_description>	child_objects_;

ASCOfficeOdfFile/src/docx/headers_footers.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "headers_footers.h"
+#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 
 namespace cpdoccore { 
@@ -87,12 +88,12 @@ std::wstring get_rel_type(headers_footers::Type _Type)
 
 void headers_footers::dump_rels(rels & Rels) const//внешние релсы
 {
-	for (boost::unordered_map<std::wstring, instances_array>::const_iterator it = instances_.begin(); it != instances_.end(); ++it)
+    BOOST_FOREACH(const instances_map::value_type & instAr, instances_)
     {
-		for (size_t i = 0; i < it->second.size(); i++)
+        BOOST_FOREACH(const instance_ptr & inst, instAr.second)
         {
-			if (it->second[i]->type_ == none) continue;
-            Rels.add( relationship( it->second[i]->id_,  get_rel_type(it->second[i]->type_),  it->second[i]->name_, L"" ) );
+			if (inst->type_ == none) continue;
+            Rels.add( relationship( inst->id_,  get_rel_type(inst->type_),  inst->name_, L"" ) );
         }
     }        
 }
@@ -106,13 +107,9 @@ bool headers_footers::write_sectPr(const std::wstring & StyleName, bool next_pag
 
 	bool first	=	false, left	=	false;
 	bool res	=	false;
-
-	instances_array & pFind = instances_.at(StyleName);
    
-	for (size_t i = 0; i < pFind.size(); i++)
+	BOOST_FOREACH(const instance_ptr & inst, instances_.at(StyleName))
     {
-		instance_ptr & inst = pFind[i];
-
         std::wstring type = L"default";
 		
 		if ( inst->type_ == headerFirst || inst->type_ == footerFirst )

ASCOfficeOdfFile/src/docx/measuredigits.cpp

@@ -36,7 +36,7 @@
 
 #include <float.h>
 
-#include "../../../DesktopEditor/graphics/pro/Fonts.h"
+#include "../../DesktopEditor/graphics/pro/Fonts.h"
 
 namespace cpdoccore {
 namespace utils {

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -41,7 +41,6 @@
 
 #include "../../DesktopEditor/common/Directory.h"
 #include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
-#include "../../DesktopEditor/graphics/pro/Fonts.h"
 
 namespace cpdoccore { 
 namespace oox {
@@ -75,32 +74,7 @@ mediaitems::item::item(	std::wstring const & _href,
 	count_add = 1;
 	count_used = 0;
 }
-mediaitems::mediaitems(const std::wstring & odfPacket) : odf_packet_(odfPacket)
-{
-	count_charts	= 0;
-	count_shape		= 0;
-	count_image		= 0;
-	count_tables	= 0;
-	count_media		= 0;
-	count_object	= 0;
-	count_audio		= 0;
-	count_video		= 0;
-	count_slide		= 0;
-	count_activeX	= 0;	
-	count_control	= 0;	
 
-	applicationFonts_	= NSFonts::NSApplication::Create();
-}
-mediaitems::~mediaitems()
-{
-    if (applicationFonts_)
-        delete applicationFonts_;
-}
-void mediaitems::set_font_directory(std::wstring pathFonts)
-{
-    if (applicationFonts_)
-        applicationFonts_->InitializeFromFolder(pathFonts);
-}
 std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, bool & isInternal)
 {
     std::wstring ref;
@@ -127,10 +101,6 @@ std::wstring static get_default_file_name(RelsType type)
         return L"video"; 
 	case typeAudio:
         return L"audio";
-	case typeControl:
-        return L"control";
-	case typeControlProps:
-        return L"controlProps";
 	default:
         return L"";
     }
@@ -152,8 +122,8 @@ std::wstring mediaitems::create_file_name(const std::wstring & uri, RelsType typ
 
 	if (sExt.empty())
 	{
-		size_t n = uri.find(L"ObjectReplacements");
-		if (n != std::wstring::npos)
+		int n = uri.find(L"ObjectReplacements");
+		if (n >= 0)
 		{
 			if (!isInternal) return L"";
 
@@ -164,16 +134,14 @@ std::wstring mediaitems::create_file_name(const std::wstring & uri, RelsType typ
 		if (sExt.empty())
 		{
 			//то что есть .. 
-			size_t n = uri.rfind(L".");
-			if (n != std::wstring::npos) 
-				sExt = XmlUtils::GetLower(uri.substr(n));
+			int n = uri.rfind(L".");
+			if (n > 0) 
+				sExt = uri.substr(n);
 		}
 	}
 
 	if (type == typeOleObject && sExt.empty())
 		sExt = L".bin";
-	else if ( type == typeChart)
-		sExt = L".xml";
    
 	return get_default_file_name(type) + std::to_wstring(Num) + sExt;
 }
@@ -195,7 +163,7 @@ std::wstring mediaitems::detectImageFileExtension(const std::wstring &fileName)
 
 		if (!sExt.empty()) sExt = std::wstring(L".") + sExt;
 	}
-	return XmlUtils::GetLower(sExt);
+	return sExt;
 }
 
 std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, bool & isInternal, std::wstring & ref)
@@ -212,10 +180,6 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	{
 		sub_path = L"embeddings/";
 	}
-	else if ( type == typeControlProps)
-	{
-		sub_path = L"ctrlProps/";
-	}
 	else 
 	{
 		isMediaInternal = is_internal(href, odf_packet_);
@@ -234,7 +198,6 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	else if ( type == typeSlide)		number = count_slide	+ 1;
 	else if ( type == typeMsObject ||
 			  type == typeOleObject)	number = count_object	+ 1;
-	else if ( type == typeControl)		number = count_control	+ 1;
 	else
 		number = items_.size() + 1;
 	
@@ -242,6 +205,8 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	
     std::wstring inputPath	= isMediaInternal ? odf_packet_ + FILE_SEPARATOR_STR + href : href;
 	std::wstring outputPath	= isMediaInternal ? ( sub_path + inputFileName)		 : href;
+	
+	if ( type == typeChart) outputPath = outputPath + L".xml";
 
 	std::wstring id;
     for (size_t i = 0 ; i < items_.size(); i++)
@@ -268,8 +233,8 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 		}
 		else if ( type == typeImage)
 		{
-            size_t n_svm = outputPath.rfind (L".svm");
-			if ( n_svm != std::wstring::npos )
+            int n_svm = outputPath.rfind (L".svm");
+			if ( n_svm >= 0 )
 			{
 				outputPath = outputPath.substr(0, n_svm) + L".png"; 
 			}
@@ -312,19 +277,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
     isInternal = isMediaInternal;
 	return id;
 }
-std::wstring mediaitems::add_control_props(std::wstring & oox_target)
-{
-    const bool isMediaInternal = true;
-  
-	count_control++;  
-	
-	std::wstring rId = std::wstring(L"ctrlId") + std::to_wstring(count_control);
 
-	oox_target = std::wstring(L"ctrlProp") + std::to_wstring(count_control) + L".xml";
-		
-	items_.push_back( item(L"", typeControlProps, oox_target, isMediaInternal, rId) );
-    return rId;
-}
 void mediaitems::dump_rels(rels & Rels)
 {
     for (size_t i = 0; i < items_.size(); i++)

ASCOfficeOdfFile/src/docx/mediaitems.h

@@ -33,12 +33,7 @@
 
 #include "oox_rels.h"
 
-#include "../../../Common/DocxFormat/Source/XML/Utils.h"
-
-namespace NSFonts
-{
-    class IApplicationFonts;
-}
+#include "../../../../Common/DocxFormat/Source/XML/Utils.h"
 
 namespace cpdoccore { 
 namespace oox {
@@ -46,8 +41,18 @@ namespace oox {
 class mediaitems
 {
 public:
-    mediaitems(const std::wstring & odfPacket);
-	virtual ~mediaitems();
+    mediaitems(const std::wstring & odfPacket) : odf_packet_(odfPacket)
+    {
+		count_charts	= 0;
+ 		count_shape		= 0;
+ 		count_image		= 0;
+ 		count_tables	= 0;
+ 		count_media		= 0;
+		count_object	= 0;
+ 		count_audio		= 0;
+ 		count_video		= 0;
+ 		count_slide		= 0;
+	}
 
     struct item 
     {
@@ -77,17 +82,10 @@ public:
 	size_t count_shape;
 	size_t count_tables;
 	size_t count_object;
-	size_t count_activeX;
-	size_t count_control;
-
-	void set_font_directory(std::wstring pathFonts);
-	NSFonts::IApplicationFonts *applicationFonts() {return applicationFonts_;}
 
     std::wstring add_or_find(const std::wstring & href, RelsType type, bool & isInternal);//возможны ссылки на один и тот же объект
     std::wstring add_or_find(const std::wstring & href, RelsType type, bool & isInternal, std::wstring & ref);
     
-	std::wstring add_control_props	(std::wstring & oox_target);
-
 	void dump_rels(rels & Rels);
     items_array & items() { return items_; }
 
@@ -104,18 +102,15 @@ public:
 			case typeAudio:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/audio";
 			case typeVideo:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/video";
 			case typeSlide:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide";
-			case typeExternalLink:	return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLinkPath";
-			case typeActiveX:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/control";
-			case typeControlProps:	return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp";
 			default:
 				return L"";
 		}
 	}
 	static RelsType detectMediaType(const std::wstring & fileName)
 	{
-		size_t pos = fileName.rfind(L".");
+		int pos = fileName.rfind(L".");
 
-		std::wstring sExt = (pos != std::wstring::npos ? fileName.substr(pos + 1) : L"");
+		std::wstring sExt = (pos >=0 ? fileName.substr(pos + 1) : L"");
 
 		if (sExt.empty()) return typeMedia;
 
@@ -143,7 +138,6 @@ private:
 	items_array		items_;
     std::wstring	odf_packet_;
 
-    NSFonts::IApplicationFonts	*applicationFonts_;
 };
 
 }

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

@@ -171,7 +171,7 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 			if (content_.dimension_ == L"y")
 				CP_XML_ATTR(L"val",L"l");//  "b" | "l" |  "r" |  "t"// == bottom left right top
 		}
-		//oox_serialize_ln(_Wostream, content_.graphic_properties_);
+		//oox_serialize_ln(_Wostream,content_.graphic_properties_);
 
 		odf_reader::GetProperty(content_.properties_, L"num_format", strVal);
 		odf_reader::GetProperty(content_.properties_, L"link-data-style-to-source", boolVal);

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -318,7 +318,7 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 							}
 						}
 					}
-					else if (values_[i].strRef_.present && !bLocalTable_)
+					else if (values_[i].strRef_.present > 0 && !bLocalTable_)
 					{
 						CP_XML_NODE(L"c:strRef")
 						{

ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp

@@ -42,56 +42,7 @@
 #include "../odf/style_paragraph_properties.h"
 
 namespace cpdoccore { 
-namespace oox
-{
-void forms_context::start_element (int type)
-{
-	current_state_.clear();
 
-	current_state_.type	= type;
-}
-void forms_context::set_id (const std::wstring& id)
-{
-	current_state_.id = id;
-}
-void forms_context::set_name (const std::wstring& name)
-{
-	current_state_.name	= name;
-}
-void forms_context::set_label (const std::wstring& label)
-{
-	current_state_.label = label;
-}
-void forms_context::set_uuid (const std::wstring& uuid)
-{
-	current_state_.uuid	= uuid;
-}
-void forms_context::set_value (const std::wstring &value)
-{
-	current_state_.value = value;
-}
-void forms_context::set_element(odf_reader::form_element *elm)
-{
-	current_state_.element = elm;
-}
-void forms_context::end_element ()
-{
-	mapElements_.insert( std::make_pair(current_state_.id, current_state_));
-
-	current_state_.clear();
-}
-forms_context::_state& forms_context::get_state_element (std::wstring id)
-{
-	std::map<std::wstring, _state>::iterator it = mapElements_.find(id);
-	
-	if (it != mapElements_.end())
-	{
-		return it->second;
-	}
-	else 
-		return 	current_state_; //empty
-}
-//----------------------------------------------------------------------------------------------------------------
 void tabs_context::reset()
 {
 	for (size_t i = 0; i < tabs.size(); i++)
@@ -198,9 +149,7 @@ std::wstringstream & styles_context::list_style()
 
 void styles_context::docx_serialize_text_style(std::wostream & strm, std::wstring parenStyleId, std::wstring & strChange)
 {
-	const std::wstring & text_style_str = text_style_.str();
-  
-	if (!text_style_str.empty() || !text_style_ext_.empty())
+    if (!text_style_.str().empty())
 	{
 		CP_XML_WRITER(strm)
 		{
@@ -210,17 +159,14 @@ void styles_context::docx_serialize_text_style(std::wostream & strm, std::wstrin
 				{
 					CP_XML_STREAM() << L"<w:rStyle w:val=\"" << parenStyleId << L"\" />";
 				}
-				CP_XML_STREAM() << text_style_str;
+				const std::wstring & test_str = text_style_.str();
+				CP_XML_STREAM() << test_str;
 
 				if (!strChange.empty())//rPrChange
 				{
 					CP_XML_STREAM() << strChange;
 					strChange.clear();
 				}
-				if (!text_style_ext_.empty())
-				{
-					CP_XML_STREAM() << text_style_ext_;
-				}
 			}
 		}
 	}
@@ -244,7 +190,8 @@ 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), is_need_e_(false)
 {