Feature/font bugs (#202)

* Fonts bugs

* Move fonts_check version to src file

.gitignore

@@ -63,4 +63,6 @@ X2tConverter/Common/DocxFormat/DocxFormatLib/Makefile
 *.zip
 *.tar.gz
 **/*.build/
-
+*.dat
+*.txt
+*.log

ASCOfficeDocFile/Common/FormatUtils.h

@@ -769,12 +769,18 @@ namespace DocFileFormat
 
 			return bytes;
 		}
-
-        static inline std::wstring IntToWideString(int value)
+		static inline std::wstring IntToWideString(unsigned int value)
 		{
             return (std::to_wstring(value));
 		}
-
+        static inline std::wstring IntToWideString(int value)
+		{
+            return (std::to_wstring(value));
+		}  
+        static inline std::wstring SizeTToWideString(size_t value)
+		{
+            return (std::to_wstring((unsigned int)value));
+		}
 		static inline std::wstring DoubleToWideString(double value)
 		{
 			std::wstringstream src;			

ASCOfficeDocFile/Common/XmlTools.h

@@ -35,6 +35,7 @@
 #include <map>
 #include <list>
 
+#include <boost/shared_ptr.hpp>
 
 #include "../../DesktopEditor/common/File.h"
 
@@ -112,7 +113,10 @@ namespace XMLTools
 	class XMLElement
     ========================================================================================================*/
 
-    class XMLElement
+	class XMLElement;
+	typedef class boost::shared_ptr<XMLElement> XMLElementPtr;
+
+	class XMLElement
 	{
         typedef std::pair< std::wstring, std::wstring> AttributeValuePair;
 
@@ -180,7 +184,20 @@ namespace XMLTools
 			}
 			m_Elements.push_back( element );
 		}
+        void AppendChild( XMLElementPtr element, bool uniq = false)
+		{
+			if (!element) return;
 
+			if (m_ChildMap.find(element->GetName()) != m_ChildMap.end())
+			{
+				if (uniq) return; 		
+			}
+			else
+			{
+                m_ChildMap.insert(m_ChildMap.end(), std::pair<std::wstring, int>(element->GetName(), 0));
+			}
+			m_Elements.push_back( *element.get() );
+		}
         void RemoveChild( const XMLElement& element )
 		{
 			m_Elements.remove( element );
@@ -368,7 +385,6 @@ namespace XMLTools
 		}
 	};
 
-
 	class CStringXmlWriter
 	{
 		std::wstring m_str;
@@ -383,6 +399,10 @@ namespace XMLTools
 		{
 			m_str = strValue;
 		}
+		void Clear()
+		{
+			m_str.clear();
+		}
 		bool SaveToFile(const std::wstring& strFilePath, bool bEncodingToUTF8 = false)
 		{
 			NSFile::CFileBinary file;

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

@@ -77,25 +77,28 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>(newObject);
 	}
-	ByteStructure* AnnotationReferenceExDescriptor::ConstructObject(VirtualStreamReader* reader, int length)
+	AnnotationReferenceExDescriptors::AnnotationReferenceExDescriptors(size_t count, POLE::Stream* stream, unsigned int fc, unsigned int lcb)
 	{
-		AnnotationReferenceExDescriptor *newObject = new AnnotationReferenceExDescriptor();
-
-		if (reader->nWordVersion > 0)
+		if ((lcb > 0) && (NULL != stream))
 		{
+			VirtualStreamReader reader(stream, (ULONG)fc, 0);
 
+			if (fc > reader.GetSize()) return;
+
+			for (size_t i = 0; i < (std::min)((unsigned int)count, lcb / 18); i++)
+			{
+				_desc desc;
+				
+				desc.nDTTM = DateAndTime(reader.ReadUInt32());
+				reader.ReadUInt16(); //padding1
+				desc.nDepth	= reader.ReadUInt32(); 
+				desc.nDiatrdParent = reader.ReadUInt32(); 
+				unsigned int flag = reader.ReadUInt32(); 
+				
+				desc.fInkAtn = GETBIT(flag, 1);
+				
+				m_ReferencesEx.push_back(desc);
+			}
 		}
-		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

@@ -32,6 +32,7 @@
 #pragma once
 
 #include "ByteStructure.h"
+#include "DateAndTime.h"
 
 namespace DocFileFormat
 {
@@ -46,7 +47,7 @@ namespace DocFileFormat
 			return (nWordVersion > 0) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
 		}
 
-        AnnotationReferenceDescriptor() : m_AuthorIndex(0), m_BookmarkId(0)
+        AnnotationReferenceDescriptor() : m_AuthorIndex(0), m_BookmarkId(0), m_CommentId(-1)
 		{
 		}
 
@@ -59,32 +60,28 @@ namespace DocFileFormat
 		std::wstring	m_UserInitials;
 		unsigned short	m_AuthorIndex;
 		int				m_BookmarkId;
+		int				m_CommentId;
 	};
 
-	class AnnotationReferenceExDescriptor: public ByteStructure
+	class AnnotationReferenceExDescriptors
 	{
 	public:
-		static const int STRUCTURE_SIZE = 18;
-		static const int STRUCTURE_SIZE_OLD = 0;
+        AnnotationReferenceExDescriptors(size_t count, POLE::Stream* stream, unsigned int fc, unsigned int lcb);
 
-		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 ~AnnotationReferenceExDescriptors() 
 		{
 		}
 
-		virtual ~AnnotationReferenceExDescriptor() 
+        //virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
+
+		struct _desc
 		{
-		}
+			DateAndTime		nDTTM;
+			unsigned int	nDepth = 0;
+			int				nDiatrdParent = 0;
+			bool			fInkAtn = false;
+		};
 
-        virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
-
-		unsigned int	m_nDTTM;
-		unsigned int	m_nDepth;
-		unsigned int	m_nDiatrdParent;
-		bool			m_fInkAtn;
+		std::vector<_desc> m_ReferencesEx;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -85,9 +85,11 @@ namespace DocFileFormat
 			
 			if (author_str)
 			{
-                XMLTools::XMLAttribute author( L"w:author", FormatUtils::XmlEncode(*author_str));
+				XMLTools::XMLAttribute author( L"w:author", FormatUtils::XmlEncode(*author_str));
 				rPrChange.AppendAttribute( author );
 			}
+			XMLTools::XMLAttribute date( L"w:date", _revisionData->Dttm.getString());
+			rPrChange.AppendAttribute( date );
 
 			//convert revision stack
 			convertSprms( _revisionData->Changes, &rPrChange );

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -48,6 +48,9 @@ namespace DocFileFormat
 		{
 			m_document = static_cast<WordDocument*>( visited );
 
+			_UINT64 x = 0x10000001;
+			std::vector<std::wstring> arrParaId;
+
 			if ( ( m_document != NULL ) && ( m_document->FIB->m_RgLw97.ccpAtn > 0 ) )
 			{
 				m_context->_docx->RegisterComments();
@@ -55,7 +58,6 @@ namespace DocFileFormat
                 m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
                 m_pXmlWriter->WriteNodeBegin( L"w:comments", TRUE );
 
-				//write namespaces
                 m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
                 m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML );
                 m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
@@ -82,39 +84,28 @@ namespace DocFileFormat
 				int cp = m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr;
 
 				size_t count = m_document->AnnotationsReferencePlex->Elements.size();
-				for (size_t index = 0; index < count; ++index)
-				{   
-					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
-					AnnotationReferenceExDescriptor* atrdPost10 = m_document->AnnotationsReferenceExPlex ? static_cast<AnnotationReferenceExDescriptor*>(m_document->AnnotationsReferenceExPlex->Elements[index]) : NULL;
 
+				for (size_t index = 0; index < count; ++index)
+				{  
+					_paraId.clear();
+					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
+					
                     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));
-						}*/	
-					}
+
+					m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::SizeTToWideString(atrdPre10->m_CommentId));
+
 					if (atrdPre10->m_AuthorIndex < m_document->AnnotationOwners->size())	//conv_253l2H1CehgKwsxCtNk__docx.doc
 					{
 						m_pXmlWriter->WriteAttribute( L"w:author",
 							FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->m_AuthorIndex ) ));
 					}
-                    m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->m_UserInitials);
 
+					if ((m_document->AnnotationsReferencesEx) && (index < m_document->AnnotationsReferencesEx->m_ReferencesEx.size()))
+					{
+						m_pXmlWriter->WriteAttribute( L"w:date", m_document->AnnotationsReferencesEx->m_ReferencesEx[index].nDTTM.getString());
+					}
 
+                    m_pXmlWriter->WriteAttribute( L"w:initials", FormatUtils::XmlEncode(atrdPre10->m_UserInitials));
 
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
@@ -135,16 +126,70 @@ namespace DocFileFormat
 						}
 						else
 						{
-							//this PAPX is for a normal paragraph
+							if ((m_document->AnnotationsReferencesEx) && (index < m_document->AnnotationsReferencesEx->m_ReferencesEx.size()))
+							{
+								_paraId = XmlUtils::IntToString(x++, L"%08X");
+							}
 							cp = writeParagraph(cp, 0x7fffffff);
 						}
 					}
 
+					if (false == _paraId.empty())
+						arrParaId.push_back(_paraId);
+
                     m_pXmlWriter->WriteNodeEnd(L"w:comment" );
 				}
-
                 m_pXmlWriter->WriteNodeEnd( L"w:comments" );
 				m_context->_docx->CommentsXML = std::wstring(m_pXmlWriter->GetXmlString()); 
+
+				m_pXmlWriter->Clear();
+
+				if (false == arrParaId.empty() && (m_document->AnnotationsReferencesEx) && (false == m_document->AnnotationsReferencesEx->m_ReferencesEx.empty()))
+				{
+					m_context->_docx->RegisterCommentsExtended();
+
+					m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
+					m_pXmlWriter->WriteNodeBegin( L"w15:commentsEx", TRUE );
+
+					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: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 );
+
+					for (size_t index = 0; index < m_document->AnnotationsReferencesEx->m_ReferencesEx.size(); ++index)
+					{  
+						m_pXmlWriter->WriteNodeBegin( L"w15:commentEx", TRUE );
+						
+						m_pXmlWriter->WriteAttribute( L"w15:paraId", arrParaId[index]);
+						if (m_document->AnnotationsReferencesEx->m_ReferencesEx[index].nDepth > 0)
+						{
+							m_pXmlWriter->WriteAttribute( L"w15:paraIdParent", arrParaId[index + m_document->AnnotationsReferencesEx->m_ReferencesEx[index].nDiatrdParent]);
+						}
+						m_pXmlWriter->WriteAttribute( L"w15:done", L"0");
+						m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+
+						m_pXmlWriter->WriteNodeEnd(L"w15:commentEx" );
+					}
+					m_pXmlWriter->WriteNodeEnd( L"w15:commentsEx" );
+					m_context->_docx->CommentsExtendedXML = std::wstring(m_pXmlWriter->GetXmlString()); 
+				}
 			}
 		}
 	};

ASCOfficeDocFile/DocDocxConverter/ContentTypes.h

@@ -91,6 +91,7 @@ namespace WordprocessingMLContentTypes
     static const wchar_t* Settings				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml";
 
     static const wchar_t* Comments				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml";
+	static const wchar_t* CommentsExtended		=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml";
 
     static const wchar_t* Footnotes				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml";
     static const wchar_t* Endnotes				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml";
@@ -154,6 +155,7 @@ namespace OpenXmlRelationshipTypes
     static const wchar_t* CustomXml				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml";
     static const wchar_t* CustomXmlProperties	=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps";
     static const wchar_t* Comments				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments";
+	static const wchar_t* CommentsExtended		=	L"http://schemas.microsoft.com/office/2011/relationships/commentsExtended";
     static const wchar_t* Footnotes				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes";
     static const wchar_t* Endnotes				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes";
     static const wchar_t* Header				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/header";

ASCOfficeDocFile/DocDocxConverter/DateAndTime.h

@@ -37,95 +37,80 @@ namespace DocFileFormat
 {
   class DateAndTime
   {
-    private:
-	  /// minutes (0-59)
-      short mint;
-      /// hours (0-23)
-      short hr;
-      /// day of month (1-31)
-      short dom;
-      /// month (1-12)
-      short mon;
-      /// year (1900-2411)-1900
-      short yr;
-      /// weekday<br/>
-      /// 0 Sunday
-      /// 1 Monday
-      /// 2 Tuesday
-      /// 3 Wednesday
-      /// 4 Thursday
-      /// 5 Friday
-      /// 6 Saturday
-      short wdy;
+    protected:
+		short minutes;
+		short hour;
+		short day;
+		short month;
+		short year;
+		/// 0 Sunday
+		/// 1 Monday
+		/// 2 Tuesday
+		/// 3 Wednesday
+		/// 4 Thursday
+		/// 5 Friday
+		/// 6 Saturday
+		short weekday;
 
     public:
 		DateAndTime()
 		{
 			setDefaultValues();
 		}
-		DateAndTime( unsigned int val )
+		DateAndTime( _UINT32 val )
 		{
-			DateAndTime((unsigned char*)&val, 4);
+			unsigned char* bytes = ((unsigned char*) &val);
+
+			minutes	= (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, 4 ), 0, 6 );
+			hour	= (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, 4 ), 6, 5 );
+			day		= (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, 4 ), 11, 5 );
+			month	= (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, 4 ), 16, 4 );
+			year	= (short)( 1900 + FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, 4 ), 20, 9 ) );
+			weekday	= (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, 4 ), 29, 3 );
 		}
 		DateAndTime( unsigned char* bytes, int size )
 		{
 			if ( size == 4 )
 			{
-			  this->mint    = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 0, 6 );
-			  this->hr      = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 6, 5 );
-			  this->dom     = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 11, 5 );
-			  this->mon     = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 16, 4 );
-			  this->yr      = (short)( 1900 + FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 20, 9 ) );
-			  this->wdy     = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 29, 3 );
+			  minutes	= (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 0, 6 );
+			  hour		= (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 6, 5 );
+			  day		= (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 11, 5 );
+			  month		= (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 16, 4 );
+			  year		= (short)( 1900 + FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 20, 9 ) );
+			  weekday	= (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 29, 3 );
 			}
 			else
 			{
 			  //throw new ByteParseException("Cannot parse the struct DTTM, the length of the struct doesn't match");
 			}
 		}
-#if defined(_WIN32) || defined(_WIN64)
-	  SYSTEMTIME ToSYSTEMTIME()
-      {
-	    SYSTEMTIME st = { 0 };
-		
-		if ( ( this->yr == 1900 ) && ( this->mon == 0 ) && ( this->dom == 0 ) &&
-			 ( this->hr == 0 ) && ( this->mint == 0 ) )
-        {
-		  st.wYear = 1900;
-		  st.wMonth = 1;
-		  st.wDayOfWeek = 0;
-		  st.wDay = 1;
-		  st.wHour = 0;
-		  st.wMinute = 0;
-		  st.wSecond = 0;
-		  st.wMilliseconds = 0;
-
-		  return st;
-        }
-        else
-        {
-          st.wYear = this->yr;
-		  st.wMonth = this->mon;
-		  st.wDayOfWeek = 0;
-		  st.wDay = this->dom;
-		  st.wHour = this->hr;
-		  st.wMinute = this->mint;
-		  st.wSecond = 0;
-		  st.wMilliseconds = 0;
-
-		  return st;
-        } 
-      }
-#endif
+		DateAndTime& operator=(const DateAndTime& oSrc)
+		{
+			minutes = oSrc.minutes;
+ 			hour = oSrc.hour;
+			day = oSrc.day;
+			month = oSrc.month;
+			year = oSrc.year;
+ 			weekday = oSrc.weekday;
+			
+			return (*this);
+		}
+		std::wstring getString()
+		{
+			return std::to_wstring(year) + L"-"	+	(month < 9 ? L"0" : L"" )	+ std::to_wstring(month)	+ L"-" + 
+													(day < 9 ? L"0" : L"" )		+ std::to_wstring(day)		+ L"T" +
+													(hour < 9 ? L"0" : L"" )	+ std::to_wstring(hour)		+ L":" +
+													(minutes < 9 ? L"0" : L"" )	+ std::to_wstring(minutes)	+ L":00Z";
+		}
       private:
 	    void setDefaultValues()
         {
-          this->dom = 0;
-          this->hr = 0;
-          this->mint = 0;
-          this->mon = 0;
-          this->wdy = 0;
-          this->yr = 0;
+          day = 0;
+          hour = 0;
+          minutes = 0;
+          month = 0;
+          weekday = 0;
+          year = 0;
         }
   };
 }

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -61,7 +61,7 @@ namespace DocFileFormat
 
 	DocumentMapping::DocumentMapping(ConversionContext* context, XMLTools::CStringXmlWriter* writer, IMapping* caller):_skipRuns(0),  _lastValidPapx(NULL), _lastValidSepx(NULL), 
 		AbstractOpenXmlMapping(writer), _sectionNr(0), _footnoteNr(0), _endnoteNr(0),
-		_commentNr(0), _caller(caller)
+		_commentNr(1), _caller(caller)
 	{
 		m_document				=	NULL;
 		m_context				=	context;
@@ -217,6 +217,11 @@ namespace DocFileFormat
 		// start paragraph
 		
         m_pXmlWriter->WriteNodeBegin(L"w:p", true);
+
+		if (false == _paraId.empty())
+		{
+			m_pXmlWriter->WriteAttribute(L"w14:paraId", _paraId);
+		}
 		writeParagraphRsid(papx);
 
 // ----------- check for section properties
@@ -369,7 +374,7 @@ namespace DocFileFormat
 				
 				if (DocFileFormat::sprmPRsid == iter->OpCode)
 				{
-                    std::wstring id = FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt32(iter->Arguments, 0, iter->argumentsSize), L"%08x");
+                    std::wstring id = FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt32(iter->Arguments, 0, iter->argumentsSize), L"%08X");
 					m_context->AddRsid(id);
                     m_pXmlWriter->WriteAttribute(L"w:rsidP", id);
 
@@ -406,8 +411,8 @@ namespace DocFileFormat
 				//if it's a inserted run
                 m_pXmlWriter->WriteNodeBegin(L"w:ins", true);
                 m_pXmlWriter->WriteAttribute(L"w:author", FormatUtils::XmlEncode(*author));
+                m_pXmlWriter->WriteAttribute(L"w:date", FormatUtils::XmlEncode(rev.Dttm.getString()));
                 m_pXmlWriter->WriteNodeEnd(L"", true, false);
-				//rev.Dttm.Convert(new DateMapping(m_pXmlWriter));
 			}
 
 			//start run
@@ -416,21 +421,21 @@ namespace DocFileFormat
 			//append rsids
 			if (0 != rev.Rsid)
 			{
-                std::wstring rsid = FormatUtils::IntToFormattedWideString(rev.Rsid, L"%08x");
+                std::wstring rsid = FormatUtils::IntToFormattedWideString(rev.Rsid, L"%08X");
                 m_pXmlWriter->WriteAttribute(L"w:rsidR", rsid);
 				m_context->AddRsid(rsid);
 			}
 
 			if (0 != rev.RsidDel)
 			{
-                std::wstring rsidDel = FormatUtils::IntToFormattedWideString(rev.RsidDel, L"%08x");
+                std::wstring rsidDel = FormatUtils::IntToFormattedWideString(rev.RsidDel, L"%08X");
                 m_pXmlWriter->WriteAttribute(L"w:rsidDel", rsidDel);
 				m_context->AddRsid(rsidDel);
 			}
 
 			if (0 != rev.RsidProp)
 			{
-                std::wstring rsidProp = FormatUtils::IntToFormattedWideString(rev.RsidProp, L"%08x");
+                std::wstring rsidProp = FormatUtils::IntToFormattedWideString(rev.RsidProp, L"%08X");
                 m_pXmlWriter->WriteAttribute(L"w:rsidRPr", rsidProp);
 				m_context->AddRsid(rsidProp);
 			}
@@ -716,7 +721,7 @@ namespace DocFileFormat
 						RELEASEOBJECT( chpxs );
 					}
 				}
-				oleWriter.WriteString( _lastOLEObject );
+				oleWriter.WriteString( _lastOLEObject ); _lastOLEObject.clear();
                 oleWriter.WriteNodeEnd( L"w:object" );
 
 				if (!oVmlMapper.m_isEmbedded && oVmlMapper.m_isEquation)
@@ -800,8 +805,9 @@ namespace DocFileFormat
 					}
 				}
 				XMLTools::XMLElement elem(L"w:br");
-                elem.AppendAttribute(L"w:type", L"textWrapping");
-                elem.AppendAttribute(L"w:clear", L"all");
+				//СЗ в МРФ Техноград о предоставлении ТП 1 квартал 2019_MO_Q31.doc
+                //elem.AppendAttribute(L"w:type", L"textWrapping");
+                //elem.AppendAttribute(L"w:clear", L"all");
 
 				m_pXmlWriter->WriteString(elem.GetXMLString());
 			}
@@ -892,12 +898,16 @@ namespace DocFileFormat
 			}
 			else if ((TextMark::Symbol == code) && fSpec)
 			{
+				writeNotesReferences(cp);//for word95 & non-automatic notes
+
 				Symbol s = getSymbol( chpx );
 
-                //m_pXmlWriter->WriteNodeBegin(L"w:sym", true);
-                //m_pXmlWriter->WriteAttribute(L"w:font", FormatUtils::XmlEncode(s.FontName));
-                //m_pXmlWriter->WriteAttribute(L"w:char", FormatUtils::XmlEncode(s.HexValue));
-                //m_pXmlWriter->WriteNodeEnd(L"", true);
+				//<w:sym w:font="Symbol" w:char="F062"/>
+
+                m_pXmlWriter->WriteNodeBegin(L"w:sym", true);
+                m_pXmlWriter->WriteAttribute(L"w:font", FormatUtils::XmlEncode(s.FontName));
+                m_pXmlWriter->WriteAttribute(L"w:char", FormatUtils::XmlEncode(s.HexValue));
+                m_pXmlWriter->WriteNodeEnd(L"", true);
 			}
 			else if ((TextMark::DrawnObject == code) && fSpec)
 			{
@@ -912,6 +922,7 @@ namespace DocFileFormat
 					pSpa	=	static_cast<Spa*>(m_document->OfficeDrawingPlexHeader->GetStruct(headerCp));
 				}
 
+				bool bPicture = false;
 				if (pSpa)
 				{
 					PictureDescriptor pictDiscr(chpx, m_document->WordDocumentStream, 0x7fffffff, m_document->nWordVersion);
@@ -925,6 +936,8 @@ namespace DocFileFormat
 							
 						pShape->Convert(&oVmlWriter);
 						m_pXmlWriter->WriteNodeEnd (L"w:pict");
+
+						bPicture = true;
 					}
 					
 					if (!pSpa->primitives.empty())
@@ -933,8 +946,13 @@ namespace DocFileFormat
 						VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, pSpa, &pictDiscr,  _caller);
 						pSpa->primitives.Convert(&oVmlWriter);
                         m_pXmlWriter->WriteNodeEnd (L"w:pict");
+						
+						bPicture = true;
 					}
 				}
+
+				if ((false == _fieldLevels.empty()) && (_fieldLevels.back().bSeparate))
+					_fieldLevels.back().bResult = bPicture;
 			}
 			else if (TextMark::Picture == code && fSpec)
 			{
@@ -1004,49 +1022,30 @@ namespace DocFileFormat
 							oPicture.shapeContainer->Convert(&oVmlMapper);
 						}
 						
-						pictWriter.WriteNodeEnd	 (L"w:pict");
+						pictWriter.WriteNodeEnd (L"w:pict");
 
 						if (!bFormula)
-							m_pXmlWriter->WriteString(pictWriter.GetXmlString());
+						{
+							if (false == _fieldLevels.empty())
+							{
+								if (_fieldLevels.back().bSeparate && !_fieldLevels.back().bResult)	//ege15.doc
+								{
+									m_pXmlWriter->WriteString(pictWriter.GetXmlString());
+									_fieldLevels.back().bResult = true;
+								}
+							}
+							else
+							{
+								m_pXmlWriter->WriteString(pictWriter.GetXmlString());
+							}
+						}
 					}
 
 				}                   
 			}
 			else if ((TextMark::AutoNumberedFootnoteReference == code) && fSpec)
 			{
-				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 );
-				}
-				else if ((m_document->IndividualFootnotesPlex != NULL) && (m_document->IndividualFootnotesPlex->IsCpExists(cp - m_document->FIB->m_RgLw97.ccpText)))
-				{
-                    m_pXmlWriter->WriteNodeBegin( L"w:footnoteRef", true );
-                    m_pXmlWriter->WriteNodeEnd( L"", true );
-				}
-				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 );
-				}
-				else if ((m_document->IndividualEndnotesPlex != NULL) && 
-					(m_document->IndividualEndnotesPlex->IsCpExists(cp - m_document->FIB->m_RgLw97.ccpAtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpText)))
-				{
-                    m_pXmlWriter->WriteNodeBegin( L"w:endnoteRef", true );
-                    m_pXmlWriter->WriteNodeEnd( L"", true );
-				}
+				writeNotesReferences(cp);
 			}
 			else if (TextMark::AnnotationReference == code)
 			{
@@ -1055,15 +1054,44 @@ 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 if (m_document->AnnotationsReferencePlex) 
 				{
 					m_pXmlWriter->WriteNodeBegin( L"w:commentReference", true );
-					m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr++ ));
+
+					AnnotationReferenceDescriptor* atrdPre10 = dynamic_cast<AnnotationReferenceDescriptor*>( m_document->AnnotationsReferencePlex->GetStruct(cp));
+
+					if (atrdPre10)
+					{
+						if (atrdPre10->m_CommentId < 0)
+						{
+							if (atrdPre10->m_BookmarkId < 0)
+							{
+								atrdPre10->m_CommentId = _commentNr++;
+							}
+							else
+							{
+								std::map<int, int>::iterator pFind = m_document->mapCommentsBookmarks.find(atrdPre10->m_BookmarkId);
+								if (pFind == m_document->mapCommentsBookmarks.end())
+								{
+									atrdPre10->m_CommentId = _commentNr++;
+									m_document->mapCommentsBookmarks.insert(std::make_pair(atrdPre10->m_BookmarkId, atrdPre10->m_CommentId));
+								}
+								else
+								{
+									atrdPre10->m_CommentId = pFind->second;
+								}
+							}
+						}
+						m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString(atrdPre10->m_CommentId));
+					}
+					
 					m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
 			}
 			else if (!FormatUtils::IsControlSymbol(c) && ((int)c != 0xFFFF))
 			{
+
+				writeNotesReferences(cp);//for word95 & non-automatic notes
                 text += FormatUtils::GetXMLSymbol(c);
 			}
 
@@ -1349,6 +1377,7 @@ namespace DocFileFormat
 						fEndNestingLevel = ( iter->Arguments[0] == 1 ) ? (true) : (false);
 					}break;
 
+					case sprmOldPFInTable:
 					case sprmPItap:
 					{
 						iTap_current = FormatUtils::BytesToUInt32( iter->Arguments, 0, iter->argumentsSize );
@@ -1389,7 +1418,7 @@ namespace DocFileFormat
 					}
 				}
 			}
-			if (nestingLevel > 1 && fEndNestingLevel && !boundaries.empty())
+			if (nestingLevel != iTap_current && fEndNestingLevel && !boundaries.empty())
 				break;
 			//get the next papx
 			papx = findValidPapx( fcRowEnd );
@@ -1735,7 +1764,51 @@ namespace DocFileFormat
 
 		return cpCellEnd;
 	}
-
+	bool DocumentMapping::writeNotesReferences(int cp)
+	{
+		if ((m_document->FootnoteReferenceCharactersPlex != NULL) && (m_document->FootnoteReferenceCharactersPlex->IsCpExists(cp)))
+		{
+			FootnoteDescriptor* desc = dynamic_cast<FootnoteDescriptor*>(m_document->FootnoteReferenceCharactersPlex->Elements[_footnoteNr]);
+			if ((desc) && (false == desc->bUsed))
+			{
+				desc->bUsed = true;
+				m_pXmlWriter->WriteNodeBegin( L"w:footnoteReference", true );
+				if (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 );
+			}
+		}
+		else if ((m_document->IndividualFootnotesPlex != NULL) && (m_document->IndividualFootnotesPlex->IsCpExists(cp - m_document->FIB->m_RgLw97.ccpText)))
+		{
+            m_pXmlWriter->WriteNodeBegin( L"w:footnoteRef", true );
+            m_pXmlWriter->WriteNodeEnd( L"", true );
+		}
+		else if ((m_document->EndnoteReferenceCharactersPlex != NULL) && (m_document->EndnoteReferenceCharactersPlex->IsCpExists(cp)))
+		{
+			EndnoteDescriptor* desc = dynamic_cast<EndnoteDescriptor*>(m_document->EndnoteReferenceCharactersPlex->Elements[_endnoteNr]);
+			if ((desc) && (false == desc->bUsed))
+			{
+				desc->bUsed = true;
+				m_pXmlWriter->WriteNodeBegin( L"w:endnoteReference", true );
+				if (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 );
+			}
+		}
+		else if ((m_document->IndividualEndnotesPlex != NULL) && 
+			(m_document->IndividualEndnotesPlex->IsCpExists(cp - m_document->FIB->m_RgLw97.ccpAtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpText)))
+		{
+            m_pXmlWriter->WriteNodeBegin( L"w:endnoteRef", true );
+            m_pXmlWriter->WriteNodeEnd( L"", true );
+		}
+		return true;
+	}
 	bool DocumentMapping::writeBookmarks(int cp)
 	{
 		bool result =	true;
@@ -1762,16 +1835,32 @@ namespace DocFileFormat
 
 		for (size_t i = 0; i < m_document->AnnotStartEndCPs.size(); i++)
 		{
-			if (m_document->AnnotStartEndCPs[i].first == cp)
+			if (m_document->AnnotStartEndCPs[i].start == cp)
 			{
-				result = writeAnnotationStart(i + 1);
-				_commentNr = i + 1;
+				int index = -1;
+				std::map<int, int>::iterator pFind = m_document->mapCommentsBookmarks.find(m_document->AnnotStartEndCPs[i].bookmarkId);
+				if (pFind == m_document->mapCommentsBookmarks.end())
+				{
+					index = _commentNr++;
+					m_document->mapCommentsBookmarks.insert(std::make_pair(m_document->AnnotStartEndCPs[i].bookmarkId, index ));
+				}
+				else index = pFind->second;
+
+				result = writeAnnotationStart(index);
 			}
 
-			if (m_document->AnnotStartEndCPs[i].second == cp)
+			if (m_document->AnnotStartEndCPs[i].end == cp)
 			{
-				result = writeAnnotationEnd(i + 1);  
-				_commentNr = i + 1;
+				int index = -1;
+				std::map<int, int>::iterator pFind = m_document->mapCommentsBookmarks.find(m_document->AnnotStartEndCPs[i].bookmarkId);
+				if (pFind == m_document->mapCommentsBookmarks.end())
+				{
+					index = _commentNr++;
+					m_document->mapCommentsBookmarks.insert(std::make_pair(m_document->AnnotStartEndCPs[i].bookmarkId, index ));
+				}
+				else index = pFind->second;
+
+				result = writeAnnotationEnd(index);  
 			}
 		}
 
@@ -1878,7 +1967,7 @@ namespace DocFileFormat
 				FontFamilyName* ffn = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( fontIndex ) );
 
 				ret.FontName = ffn->xszFtn;
-                ret.HexValue = FormatUtils::IntToFormattedWideString( code, L"%04x" );
+                ret.HexValue = FormatUtils::IntToFormattedWideString( code, L"%04X" );
 
 				break;
 			}

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -121,6 +121,8 @@ namespace DocFileFormat
 		bool writeBookmarkStart	( short id );
 		bool writeBookmarkEnd	( short id );
 
+		bool writeNotesReferences(int cp);
+
 		bool writeAnnotations	( int cp );
 		bool writeAnnotationStart( short id );
 		bool writeAnnotationEnd	( short id );
@@ -156,11 +158,14 @@ namespace DocFileFormat
 		std::wstring					_writeAfterRun;
 		std::wstring					_lastOLEObject;
 		int								_cacheListNum;
+
+		std::wstring					_paraId;
 		
 		struct fieldLevels
 		{
 			bool bBegin = false;
 			bool bSeparate = false;
+			bool bResult = false;
 			//bool bInstrText = false;
 			bool bEnd = false;
 		};

ASCOfficeDocFile/DocDocxConverter/EndnoteDescriptor.h

@@ -40,7 +40,7 @@ namespace DocFileFormat
     public:
       static const int STRUCTURE_SIZE = 2;
 
-	  EndnoteDescriptor(): aEndIdx(0) {}
+	  EndnoteDescriptor(): aEndIdx(0), bUsed(false) {}
 
 	  virtual ~EndnoteDescriptor()
 	  {
@@ -54,6 +54,7 @@ namespace DocFileFormat
 		return static_cast<ByteStructure*>( newObject );
       }
 
+	  bool bUsed;
 	  short aEndIdx;
   };
 }

ASCOfficeDocFile/DocDocxConverter/FileInformationBlock.h

@@ -492,9 +492,12 @@ namespace DocFileFormat
 
 	struct FibNew
 	{
-		FibNew() : nFibNew(Fib1997), cQuickSavesNew(0) {}
+		FibNew() : nFibNew(Fib1997), cQuickSavesNew(0), lidThemeOther(0), lidThemeFE(0), lidThemeCS(0)  {}
 		FibVersion nFibNew;
 		WORD cQuickSavesNew;
+		WORD lidThemeOther;
+		WORD lidThemeFE;
+		WORD lidThemeCS;
 	};
 
 
@@ -545,11 +548,11 @@ namespace DocFileFormat
 				}
 				else
 				{
-					/*ccpSpare0	= */			reader.ReadInt32();	
-					/*ccpSpare1	= */			reader.ReadInt32();
-					/*ccpSpare2	= */			reader.ReadInt32();	
+					int	ccpSpare0				= reader.ReadInt32();	
+					int	ccpSpare1				= reader.ReadInt32();
+					int	ccpSpare2				= reader.ReadInt32();	
 				}
-				/*ccpSpare3	= */			reader.ReadInt32();	
+				int	ccpSpare3					= reader.ReadInt32();	
 
 				if (m_FibBase.nFib > Fib1985)
 				{
@@ -872,23 +875,43 @@ namespace DocFileFormat
 			}
             if (m_FibBase.nFib > Fib1995 || m_FibBase.nFib == 0)
 			{				
-				reader.ReadBytes(8, false); //68
+				int reserv1			=	reader.ReadInt32();
+				int reserv2			=	reader.ReadInt32();
 				
 				m_RgLw97.ccpText	=	reader.ReadInt32(); //76
 				m_RgLw97.ccpFtn		=	reader.ReadInt32(); //80
 				m_RgLw97.ccpHdr		=	reader.ReadInt32(); //84
 				
-				reader.ReadBytes( 4, false ); //88
+				int reserv3			=	reader.ReadInt32();
 				
 				m_RgLw97.ccpAtn		=	reader.ReadInt32(); //92
 				m_RgLw97.ccpEdn		=	reader.ReadInt32(); //96
 				m_RgLw97.ccpTxbx	=	reader.ReadInt32(); //100
 				m_RgLw97.ccpHdrTxbx	=	reader.ReadInt32(); //104
 				
-				reader.ReadBytes(44, false); //108
+				int reserv4			=	reader.ReadInt32();
+				int reserv5			=	reader.ReadInt32();
+				int reserv6			=	reader.ReadInt32();
+				int reserv7			=	reader.ReadInt32();
+				int reserv8			=	reader.ReadInt32();
+				int reserv9			=	reader.ReadInt32();
+				int reserv10		=	reader.ReadInt32();
+				int reserv11		=	reader.ReadInt32();
+				int reserv12		=	reader.ReadInt32();
+				int reserv13		=	reader.ReadInt32();
+				int reserv14		=	reader.ReadInt32();
 
 				cbRgFcLcb			=	reader.ReadUInt16(); //152
-				
+
+				switch(cbRgFcLcb)
+				{
+					case 0x005D:	m_FibBase.nFib = Fib1997; break;
+					case 0x006C:	m_FibBase.nFib = Fib2000; break;
+					case 0x0088:	m_FibBase.nFib = Fib2002; break;
+					case 0x00A4:	m_FibBase.nFib = Fib2003; break;
+					case 0x00B7:	m_FibBase.nFib = Fib2007; break;
+				}
+
 				m_FibWord97.fcStshfOrig		= reader.ReadUInt32(); //154
 				m_FibWord97.lcbStshfOrig	= reader.ReadUInt32(); //158
 				m_FibWord97.fcStshf			= reader.ReadUInt32(); //162
@@ -922,7 +945,7 @@ namespace DocFileFormat
 				m_FibWord97.fcSttbfFfn		= reader.ReadUInt32(); //274
 				m_FibWord97.lcbSttbfFfn		= reader.ReadUInt32(); //278
 				m_FibWord97.fcPlcfFldMom	= reader.ReadUInt32(); //282
-				m_FibWord97.lcbPlcfFldMom			= reader.ReadUInt32(); //286
+				m_FibWord97.lcbPlcfFldMom	= reader.ReadUInt32(); //286
 				m_FibWord97.fcPlcfFldHdr	= reader.ReadUInt32(); //290
 				m_FibWord97.lcbPlcfFldHdr	= reader.ReadUInt32(); //294
 				m_FibWord97.fcPlcfFldFtn	= reader.ReadUInt32(); //298
@@ -1286,11 +1309,24 @@ namespace DocFileFormat
 
 			if (cswNew != 0)
 			{
-				//Read the FibRgCswNew
+	//Read the FibRgCswNew
 				m_FibNew.nFibNew = (FibVersion)reader.ReadUInt16();
 				
 				if (m_FibNew.nFibNew == 0) m_FibNew.nFibNew = Fib1997;
+
 				m_FibNew.cQuickSavesNew = reader.ReadUInt16();
+			
+				if (m_FibNew.nFibNew == 0x00D9 ||
+					m_FibNew.nFibNew == 0x0101 ||
+					m_FibNew.nFibNew == 0x010C )
+				{
+				}
+				else if (m_FibNew.nFibNew == 0x0112)
+				{
+					m_FibNew.lidThemeOther	= reader.ReadUInt16();
+					m_FibNew.lidThemeFE		= reader.ReadUInt16();
+					m_FibNew.lidThemeCS		= reader.ReadUInt16();
+				}
 			}
 		}
 		FileInformationBlock( VirtualStreamReader reader )
@@ -1363,13 +1399,26 @@ namespace DocFileFormat
 			}
 			else if (m_FibBase.nFib > Fib1995 || m_FibBase.nFib == 0)
 			{					
-				//read the RgW97
-				reader.ReadBytes( 26, false ); //34 
+			//read the RgW97
+				int reserv1		= reader.ReadUInt16();
+				int reserv2		= reader.ReadUInt16();
+				int reserv3		= reader.ReadUInt16();
+				int reserv4		= reader.ReadUInt16();
+				int reserv5		= reader.ReadUInt16();
+				int reserv6		= reader.ReadUInt16();
+				int reserv7		= reader.ReadUInt16();
+				int reserv8		= reader.ReadUInt16();
+				int reserv9		= reader.ReadUInt16();
+				int reserv10	= reader.ReadUInt16();
+				int reserv11	= reader.ReadUInt16();
+				int reserv12	= reader.ReadUInt16();
+				int reserv13	= reader.ReadUInt16();
+				
 				m_RgW97.lidFE = reader.ReadUInt16(); //60
 
 				cslw = reader.ReadUInt16(); //62
 
-				//read the RgLW97
+			//read the RgLW97
 
 				m_RgLw97.cbMac =	reader.ReadInt32(); //64
 			}

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp

@@ -124,12 +124,12 @@ namespace DocFileFormat
 
 			//font signature
             m_pXmlWriter->WriteNodeBegin( L"w:sig", TRUE );
-            m_pXmlWriter->WriteAttribute( L"w:usb0", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield0, L"%08x" ));
-            m_pXmlWriter->WriteAttribute( L"w:usb1", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield1, L"%08x" ));
-            m_pXmlWriter->WriteAttribute( L"w:usb2", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield2, L"%08x" ));
-            m_pXmlWriter->WriteAttribute( L"w:usb3", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield3, L"%08x" ));
-            m_pXmlWriter->WriteAttribute( L"w:csb0", FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield0, L"%08x" ));
-            m_pXmlWriter->WriteAttribute( L"w:csb1", FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield1, L"%08x" ));
+            m_pXmlWriter->WriteAttribute( L"w:usb0", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield0, L"%08X" ));
+            m_pXmlWriter->WriteAttribute( L"w:usb1", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield1, L"%08X" ));
+            m_pXmlWriter->WriteAttribute( L"w:usb2", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield2, L"%08X" ));
+            m_pXmlWriter->WriteAttribute( L"w:usb3", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield3, L"%08X" ));
+            m_pXmlWriter->WriteAttribute( L"w:csb0", FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield0, L"%08X" ));
+            m_pXmlWriter->WriteAttribute( L"w:csb1", FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield1, L"%08X" ));
             m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
             m_pXmlWriter->WriteNodeEnd( L"w:sig" );
 

ASCOfficeDocFile/DocDocxConverter/FootnoteDescriptor.h

@@ -41,7 +41,7 @@ namespace DocFileFormat
     public:
 	  static const int STRUCTURE_SIZE = 2;
 
-	  FootnoteDescriptor() : aFtnIdx(0)  {}
+	  FootnoteDescriptor() : aFtnIdx(0), bUsed(false)  {}
 
 	  virtual ~FootnoteDescriptor()
 	  {
@@ -56,5 +56,6 @@ namespace DocFileFormat
       }
 
 	  short aFtnIdx;
+	  bool bUsed;
   };
 }

ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp

@@ -126,7 +126,7 @@ FormFieldData::FormFieldData( int type, const CharacterPropertyExceptions* chpx,
 			break;
 			case sprmCRsidText:
 			{
-				rsid = FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt32(iter->Arguments, 0, iter->argumentsSize), L"%08x");
+				rsid = FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt32(iter->Arguments, 0, iter->argumentsSize), L"%08X");
 			}
 			break;
 			case sprmCFData:

ASCOfficeDocFile/DocDocxConverter/ListData.cpp

@@ -122,7 +122,8 @@ namespace DocFileFormat
 		fNumber1		== val.fNumber1 &&
 		fNumberAcross	== val.fNumberAcross &&
 		fRestartHdn		== val.fRestartHdn &&
-		fSpareX			== val.fSpareX;
+		fSpareX			== val.fSpareX &&
+		xst				== val.xst;
 
 		return res;
 	}
@@ -158,7 +159,8 @@ namespace DocFileFormat
 		fNumber1		== val->fNumber1 &&
 		fNumberAcross	== val->fNumberAcross &&
 		fRestartHdn		== val->fRestartHdn &&
-		fSpareX			== val->fSpareX;
+		fSpareX			== val->fSpareX &&
+		xst				== val->xst;
 
 		return res;
 

ASCOfficeDocFile/DocDocxConverter/ListData.h

@@ -129,6 +129,7 @@ namespace DocFileFormat
 		std::wstring	xst; //32 chars ansi
 
 	public:
+		std::wstring rPr;
 
 		bool operator == (const NumberingDescriptor & val) const;
 		bool operator == (const NumberingDescriptorPtr & val) const;

ASCOfficeDocFile/DocDocxConverter/ListTable.cpp

@@ -72,16 +72,17 @@ namespace DocFileFormat
 		}
 	}
 
-	size_t ListTable::appendNumbering( NumberingDescriptorPtr &desc )
+	size_t ListTable::appendNumbering( NumberingDescriptorPtr &desc, const std::wstring & rPr )
 	{
 		for (size_t i = 0; i < listNumbering.size(); ++i)
 		{
-			if (listNumbering[i]->operator==(desc))
+			if (listNumbering[i]->operator == (desc))
 			{
 				return listNumbering[i]->id;
 			}
 		}
-		desc->id = listData.size() + listNumbering.size()/* + 1*/;
+		desc->rPr = rPr;
+		desc->id = listData.size() + listNumbering.size() + 1; // 23.doc
 		listNumbering.push_back(desc);
 		return desc->id;
 	}

ASCOfficeDocFile/DocDocxConverter/ListTable.h

@@ -47,6 +47,6 @@ namespace DocFileFormat
 		virtual ~ListTable();
 		ListTable( FileInformationBlock* fib, POLE::Stream* tableStream );
 
-		size_t appendNumbering( NumberingDescriptorPtr &desc );
+		size_t appendNumbering( NumberingDescriptorPtr &desc, const std::wstring & rPr );
   };
 }

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -92,12 +92,12 @@ namespace DocFileFormat
 			{
 				//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::SizeTToWideString( i /*+ 1 */));
                 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( rglst->listData[i]->lsid, L"%08X" ));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				//multiLevelType
@@ -120,7 +120,7 @@ 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( rglst->listData[i]->tplc, L"%08X"));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				// writes the levels
@@ -140,7 +140,7 @@ namespace DocFileFormat
 			{
 				//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::SizeTToWideString( rglst->listNumbering[i]->id ));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				////nsid
@@ -169,7 +169,7 @@ namespace DocFileFormat
 
 				//start num
                 m_pXmlWriter->WriteNodeBegin( L"w:num", TRUE );
-                m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::IntToWideString(i + 1));
+                m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::SizeTToWideString(i + 1));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				int index = FindIndexbyId( rglst->listData, lfo->lsid );
@@ -205,12 +205,12 @@ namespace DocFileFormat
 				for (size_t i = 0; i < rglst->listNumbering.size(); ++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::SizeTToWideString(rglst->listNumbering[i]->id));
                     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::SizeTToWideString( rglst->listNumbering[i]->id ));
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
                     m_pXmlWriter->WriteNodeEnd(L"w:num");
@@ -285,7 +285,7 @@ namespace DocFileFormat
 					newResult = find_if((result + 1), lvl->xst.end(), &NumberingMapping::IsPlaceholder);
 
                     ret += L"%";
-					ret += FormatUtils::IntToWideString(*result + 1);
+                    ret += FormatUtils::SizeTToWideString(*result + 1);
 					ret += std::wstring((result + 1), newResult);
 					result = newResult;
 				}
@@ -540,17 +540,24 @@ namespace DocFileFormat
         m_pXmlWriter->WriteNodeEnd(L"w:pPr");
 
 //  rPr
-        m_pXmlWriter->WriteNodeBegin( L"w:rPr", FALSE );
-
-		if (!fontFamily.empty())
+		if (false == lvl->rPr.empty())
 		{
-            m_pXmlWriter->WriteNodeBegin( L"w:rFonts", TRUE );
-				// w:hint="default"
-                m_pXmlWriter->WriteAttribute(L"w:hAnsi",fontFamily);
-                m_pXmlWriter->WriteAttribute(L"w:ascii",fontFamily);
-            m_pXmlWriter->WriteNodeEnd( L"", TRUE );
+			m_pXmlWriter->WriteString( lvl->rPr );
+		}
+		else
+		{
+			m_pXmlWriter->WriteNodeBegin( L"w:rPr", FALSE );
+
+			if (!fontFamily.empty())
+			{
+				m_pXmlWriter->WriteNodeBegin( L"w:rFonts", TRUE );
+					// w:hint="default"
+					m_pXmlWriter->WriteAttribute(L"w:hAnsi", fontFamily);
+					m_pXmlWriter->WriteAttribute(L"w:ascii", fontFamily);
+				m_pXmlWriter->WriteNodeEnd( L"", TRUE );
+			}
+			m_pXmlWriter->WriteNodeEnd(L"w:rPr");
 		}
-        m_pXmlWriter->WriteNodeEnd(L"w:rPr");
 		
         m_pXmlWriter->WriteNodeEnd(L"w:lvl");
 	}
@@ -702,7 +709,7 @@ namespace DocFileFormat
 				}
 			}
 
-			if (isPictureBullet)
+			if (isPictureBullet && false == m_document->PictureBulletsCPsMap.empty())
 			{
                 m_pXmlWriter->WriteNodeBegin(L"w:lvlPicBulletId",TRUE);
                 m_pXmlWriter->WriteAttribute(L"w:val",FormatUtils::IntToWideString(index));

ASCOfficeDocFile/DocDocxConverter/OfficeArtContent.h

@@ -89,7 +89,7 @@ namespace DocFileFormat
 								GroupContainer* group	=	static_cast<GroupContainer*>(groupChild);
 								if (group)
 								{
-									group->Index =	i;
+									group->Index =	(int)i;
 								}
 							}
 							else if (ShapeContainer::TYPE_CODE_0xF004 == groupChild->TypeCode)

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -359,24 +359,24 @@ namespace DocFileFormat
 
 		return FootnotesRelationshipsFile.RelID;
 	}
-
 	int OpenXmlPackage::RegisterEndnotes()
 	{
         return AddPart( L"word", L"endnotes.xml", WordprocessingMLContentTypes::Endnotes, OpenXmlRelationshipTypes::Endnotes );
 	}
-
 	int OpenXmlPackage::AddEndnotesPart( const std::wstring& fileName, const std::wstring& relationshipType, const std::wstring& targetMode )
 	{
         EndnotesRelationshipsFile.Relationships.push_back( Relationship( ( std::wstring( L"rId" ) + FormatUtils::IntToWideString( ++EndnotesRelationshipsFile.RelID ) ), relationshipType, fileName, targetMode ) );
 
 		return EndnotesRelationshipsFile.RelID;
 	}
-
 	int OpenXmlPackage::RegisterComments()
 	{
         return AddPart( L"word", L"comments.xml", WordprocessingMLContentTypes::Comments, OpenXmlRelationshipTypes::Comments );
 	}
-
+	int OpenXmlPackage::RegisterCommentsExtended()
+	{
+        return AddPart( L"word", L"commentsExtended.xml", WordprocessingMLContentTypes::CommentsExtended, OpenXmlRelationshipTypes::CommentsExtended );
+	}
 	int OpenXmlPackage::AddCommentsPart( const std::wstring& fileName, const std::wstring& relationshipType, const std::wstring& targetMode )
 	{
         CommentsRelationshipsFile.Relationships.push_back( Relationship( ( std::wstring( L"rId" ) + FormatUtils::IntToWideString( ++CommentsRelationshipsFile.RelID ) ), relationshipType, fileName, targetMode ) );

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h

@@ -85,19 +85,19 @@ namespace DocFileFormat
 
 	struct ImageFileStructure
 	{
-		ImageFileStructure()
+		ImageFileStructure(const std::wstring& _ext, boost::shared_array<unsigned char> _data, unsigned int _size, Global::BlipType _blipType = Global::msoblipUNKNOWN) : ext(_ext), data(_data), size(_size), blipType(_blipType)
 		{
 
 		}
-
-		ImageFileStructure(const std::wstring& _ext, const std::vector<unsigned char>& _data, Global::BlipType	_blipType = Global::msoblipUNKNOWN) : ext(_ext), data(_data), blipType(_blipType)
+		ImageFileStructure(const std::wstring& _ext, unsigned char* _data, unsigned int _size, Global::BlipType _blipType = Global::msoblipUNKNOWN) : ext(_ext), size(_size), blipType(_blipType)
 		{
-
+			data = boost::shared_array<unsigned char>(new unsigned char[size]);
+			memcpy(data.get(), _data, size);
 		}
-
-		std::wstring				ext;
-		std::vector<unsigned char>	data;
-		Global::BlipType			blipType;	
+		std::wstring						ext;
+		boost::shared_array<unsigned char>	data;
+		unsigned int						size;
+		Global::BlipType					blipType;	
 	};
 
 	struct OleObjectFileStructure
@@ -176,6 +176,7 @@ namespace DocFileFormat
 		int RegisterFootnotes();
 		int RegisterEndnotes();
 		int RegisterComments();
+		int RegisterCommentsExtended();
 		int RegisterImage			( const IMapping* mapping, Global::BlipType blipType );
 		int RegisterHyperlink		( const IMapping* mapping, const std::wstring& link);
 		int RegisterOLEObject		( const IMapping* mapping, const std::wstring& objectType );

ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.cpp

@@ -104,32 +104,33 @@ namespace DocFileFormat
 		}
 
 		//append formatting of paragraph end mark
+
+        XMLTools::XMLElementPtr rPr = XMLTools::XMLElementPtr(XMLTools::XMLElementPtr(new XMLTools::XMLElement( L"w:rPr" )));
+
 		if ( _paraEndChpx != NULL )
 		{
-            XMLTools::XMLElement* rPr = new XMLTools::XMLElement( L"w:rPr" );
-
-			//append properties
 			RevisionData* rev = new RevisionData( _paraEndChpx );
-			CharacterPropertiesMapping* ccMapping = new CharacterPropertiesMapping( rPr, m_document, rev, papx, false );
+			CharacterPropertiesMapping* ccMapping = new CharacterPropertiesMapping( rPr.get(), m_document, rev, papx, false );
+
 			_paraEndChpx->Convert( ccMapping );
 
-			//append delete infos
 			if ( rev->Type == Deleted )
 			{
-                XMLTools::XMLElement del( L"w:del" );
+				XMLTools::XMLElement del( L"w:del" );
 				rPr->AppendChild( del );
 			}
 
-			if( rPr->GetChildCount() >0 )
+			if( rPr->GetChildCount() > 0 )
 			{
-				_pPr->AppendChild( *rPr );
+				_pPr->AppendChild( rPr );
 			}
 
 			RELEASEOBJECT( ccMapping );
 			RELEASEOBJECT( rev );
-			RELEASEOBJECT( rPr );
 		}
 		
+		bool bNumPr = false;
+
 		std::list<SinglePropertyModifier>::iterator end = papx->grpprl->end();
 		for (std::list<SinglePropertyModifier>::iterator iter = papx->grpprl->begin(); iter != end; ++iter)
 		{
@@ -426,7 +427,10 @@ namespace DocFileFormat
 
 					if (m_document->listTable)
 					{
-						unsigned short numId = m_document->listTable->appendNumbering(  desc );
+						std::wstring sRPr;
+						if (rPr->GetChildCount() > 0) sRPr = rPr->GetXMLString();
+
+						unsigned short numId = m_document->listTable->appendNumbering( desc, sRPr );
                         appendValueElement( &numPr, L"numId", numId, true );
 					}
 				}break;
@@ -439,8 +443,10 @@ namespace DocFileFormat
 				case sprmOldPNLvlAnm:
 				{					
 					short level = FormatUtils::BytesToUChar( iter->Arguments, 0, iter->argumentsSize) - 1;
-					if (level > 0 && level < 10) 					
-                        appendValueElement( _pPr, L"outlineLvl", level, false );
+					
+					level = 0;
+                    appendValueElement( &numPr, L"ilvl", level, true );
+					bNumPr = true;
 				}break;				
 				
 				case sprmOldPFNoLineNumb:
@@ -456,25 +462,11 @@ namespace DocFileFormat
 				case sprmPIlfo:
 				{
 					//Если numbering.xml пустой, то не пищем свойство
-					//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 );
 					}
-
-					//check if there is a ilvl reference, if not, check the count of LVLs.
-					//if only one LVL exists in the referenced list, create a hard reference to that LVL
-					//if (containsLvlReference(papx.grpprl) == false)
-					//{
-					//    ListFormatOverride lfo = m_context.Doc.ListFormatOverrideTable[val];
-					//    int index = NumberingMapping.FindIndexbyId(m_context.Doc.ListTable, lfo.lsid);
-					//    ListData lst = m_context.Doc.ListTable[index];
-					//    if (lst.rglvl.Length == 1)
-					//    {
-					//        appendValueElement(numPr, "ilvl", "0", true);
-					//    }
-					//}
 				}
 				break;
 
@@ -645,15 +637,18 @@ namespace DocFileFormat
 				}break;
 			}
 		}
-
-		//append frame properties
+		
+		if ( numPr.GetChildCount() > 0 && ((bNumPr && m_document->nWordVersion > 0) || m_document->nWordVersion == 0))//append numPr
+		{//23.doc
+			_pPr->AppendChild( numPr );
+		}
+		
 		if ( _framePr->GetAttributeCount() > 0 )
 		{
 			_pPr->AppendChild( *_framePr );
 		}
 
 		_isSectionPageBreak = 0;
-		//append section properties
 		if ( _sepx != NULL )
 		{
             XMLTools::XMLElement sectPr( L"w:sectPr" );
@@ -672,34 +667,27 @@ namespace DocFileFormat
 			_pPr->AppendChild( sectPr );
 		}
 
-		//append indent
 		if ( ind.GetAttributeCount() > 0 )
 		{
 			_pPr->AppendChild( ind );
 		}
 		
-		if ( spacing.GetAttributeCount() > 0 )//append spacing
+		if ( spacing.GetAttributeCount() > 0 )
 		{
 			_pPr->AppendChild( spacing );
 		}
 		
-		if ( jc )	//append justification
+		if ( jc )
 		{
 			_pPr->AppendChild( *jc );
 			RELEASEOBJECT( jc );
 		}
-		
-		if ( numPr.GetChildCount() > 0 )//append numPr
-		{
-			_pPr->AppendChild( numPr );
-		}
-		
-		if ( pBdr.GetChildCount() > 0 )	//append borders
+
+		if ( pBdr.GetChildCount() > 0 )
 		{
 			_pPr->AppendChild( pBdr );
 		}
 
-		//write Properties
 		if ( ( _pPr->GetChildCount() > 0 ) || ( _pPr->GetAttributeCount() > 0 ) )
 		{
 			m_pXmlWriter->WriteString( _pPr->GetXMLString() );

ASCOfficeDocFile/DocDocxConverter/PictureDescriptor.cpp

@@ -33,6 +33,8 @@
 #include "PictureDescriptor.h"
 #include "OfficeDrawing/MetafilePictBlip.h"
 
+#include "../../DesktopEditor/raster/BgraFrame.h"
+
 #ifndef MM_ISOTROPIC
 	#define MM_ISOTROPIC 7
 #endif
@@ -41,6 +43,111 @@
 	#define MM_ANISOTROPIC 8
 #endif
 
+namespace ImageHelper
+{
+	Global::_BlipType SaveImageToFileFromDIB(unsigned char* data, int size, const std::wstring& file_name)//without ext
+	{
+		Global::_BlipType result = Global::msoblipERROR;
+
+		CBgraFrame oFrame;
+		int offset = 0, biSizeImage = 0;
+
+		__BITMAPINFOHEADER * header = (__BITMAPINFOHEADER*)data;
+		if (!header) return result;
+
+		result = Global::msoblipDIB;
+
+		if (header->biWidth > 100000 || header->biHeight > 100000 || header->biSize != 40)
+		{
+			__BITMAPCOREHEADER * header_core = (__BITMAPCOREHEADER *)data;
+			if (header_core->bcSize != 12)
+			{
+				result = Global::msoblipWMF;
+			}
+			else
+			{
+				offset = 12; //sizeof(BITMAPCOREHEADER)			
+			
+				oFrame.put_Height	(header_core->bcHeight );
+				oFrame.put_Width	(header_core->bcWidth );
+				
+				int sz_bitmap = header_core->bcHeight * header_core->bcWidth * header_core->bcBitCount/ 8;
+				
+				//if (header_core->bcWidth % 2 != 0 && sz_bitmap < size - offset)
+				//	header_core->bcWidth++;
+				///???? todooo непонятно .. в biff5 нужно флипать картинку, в biff8 не ясно ( - 
+				
+				int stride =  -(size - offset) / header_core->bcHeight;
+				oFrame.put_Stride	(stride/*header_core->bcBitCount * header_core->bcWidth /8 */);
+
+				biSizeImage = size - offset;
+				
+				if (-stride >= header_core->bcWidth && header_core->bcBitCount >=24 )
+				{
+					result = Global::msoblipPNG;
+				}
+			}
+		}
+		else
+		{
+			offset = 40; //sizeof(BITMAPINFOHEADER)
+
+			oFrame.put_Height	(header->biHeight );
+			oFrame.put_Width	(header->biWidth );
+			
+			int sz_bitmap = header->biHeight * header->biWidth * header->biBitCount/ 8;
+			
+			//if (header->biWidth % 2 != 0 && sz_bitmap < size -offset)
+			//	header->biWidth++;
+			
+			int stride = -(size - offset) / header->biHeight;
+
+			if (-stride >= header->biWidth && header->biBitCount >= 24)
+			{
+				result = Global::msoblipPNG;
+			}
+			oFrame.put_Stride	(stride/*header->biBitCount * header->biWidth /8*/);
+			
+			biSizeImage = header->biSizeImage > 0 ? header->biSizeImage : (size - offset);
+		}
+		
+//------------------------------------------------------------------------------------------
+
+		if (result == Global::msoblipPNG)
+		{
+			oFrame.put_Data((unsigned char*)data + offset);
+			
+            if (!oFrame.SaveFile(file_name + L".png", 4/*CXIMAGE_FORMAT_PNG*/))
+				result = Global::msoblipERROR;
+
+			oFrame.put_Data(NULL);
+		}
+		else if (result == Global::msoblipWMF)
+		{
+			NSFile::CFileBinary file;
+            if (file.CreateFileW(file_name + L".wmf"))
+			{
+				file.WriteFile((BYTE*)data, size);
+				file.CloseFile();
+			}
+		}
+		else if (biSizeImage > 0)
+		{
+			NSFile::CFileBinary file;
+            if (file.CreateFileW(file_name + L".bmp"))
+			{
+                _UINT16 vtType		= 0x4D42;				file.WriteFile((BYTE*)&vtType,	2);
+                _UINT32 dwLen		= biSizeImage;			file.WriteFile((BYTE*)&dwLen,	4);
+                _UINT32 dwRes		= 0;					file.WriteFile((BYTE*)&dwRes,	4);
+                _UINT32 dwOffset	= 2;					file.WriteFile((BYTE*)&dwOffset, 4);
+			
+				file.WriteFile((BYTE*)data, size);
+				file.CloseFile();
+			}
+		}
+		return result;
+	}
+}
 namespace DocFileFormat
 {
 	/// Parses the CHPX for a fcPic an loads the PictureDescriptor at this offset

ASCOfficeDocFile/DocDocxConverter/PictureDescriptor.h

@@ -134,3 +134,34 @@ namespace DocFileFormat
 		int				embeddedDataSize;						
 	};
 }
+
+
+namespace ImageHelper
+{
+    struct __BITMAPINFOHEADER
+    {
+        _UINT32     biSize;
+        _INT32      biWidth;
+        _INT32      biHeight;
+        _UINT16     biPlanes;
+        _UINT16     biBitCount;
+        _UINT32     biCompression;
+        _UINT32     biSizeImage;
+        _INT32      biXPelsPerMeter;
+        _INT32      biYPelsPerMeter;
+        _UINT32     biClrUsed;
+        _UINT32     biClrImportant;
+    };
+
+    struct __BITMAPCOREHEADER
+    {
+        _UINT32     bcSize;                 /* used to get to color table */
+        _UINT16     bcWidth;
+        _UINT16     bcHeight;
+        _UINT16     bcPlanes;
+        _UINT16     bcBitCount;
+    };
+
+	Global::_BlipType SaveImageToFileFromDIB(unsigned char* data, int size, const std::wstring& file_name);
+}
+

ASCOfficeDocFile/DocDocxConverter/SettingsMapping.cpp

@@ -259,6 +259,12 @@ namespace DocFileFormat
 		//compatibility settings
 		m_oXmlWriter.WriteNodeBegin( L"w:compat" );
 
+		m_oXmlWriter.WriteNodeBegin( L"w:compatSetting", TRUE);
+			m_oXmlWriter.WriteAttribute( L"w:name",  L"compatibilityMode" );
+			m_oXmlWriter.WriteAttribute( L"w:uri",  L"http://schemas.microsoft.com/office/word" );
+			m_oXmlWriter.WriteAttribute( L"w:val",  L"11" );
+		m_oXmlWriter.WriteNodeEnd( L"",  TRUE );
+
 		//some settings must always be written
 
 		if ( dop->fUseNormalStyleForList )

ASCOfficeDocFile/DocDocxConverter/StringTable.h

@@ -55,32 +55,45 @@ namespace DocFileFormat
 		
 		std::vector<ByteStructure*>	Data;
 
+		std::vector<unsigned char*>	DataExtra;
 		int							code_page;
 	public:
 		virtual ~StringTable()
 		{
-			for ( std::vector<ByteStructure*>::iterator iter = this->Data.begin(); iter != this->Data.end(); iter++ )
+			for ( size_t i = 0; i < this->Data.size(); ++i )
 			{
-				RELEASEOBJECT( *iter );
+				RELEASEOBJECT( this->Data[i] );
+
+				if (false == this->DataExtra.empty())
+				{
+					if (this->DataExtra[i])
+					{
+						delete []this->DataExtra[i];
+						this->DataExtra[i] = NULL;
+					}	
+				}
 			}
+
 		}
 
 		StringTable( VirtualStreamReader *reader, int code_page_ ): 
-                            code_page(code_page_), fExtend(false), cbData(0), cbExtra(0)
+                            code_page(code_page_), fExtend(false), cbData(0), cbExtra(0), DataExtra(NULL)
 		{
-            parse( reader, (unsigned int)reader->GetPosition() );
+            parse( reader, (unsigned int)reader->GetPosition(), 0, false );
 		}
 
-		StringTable( POLE::Stream* tableStream, unsigned int fc, unsigned int lcb, int nWordVersion ) :
-												code_page(1250), fExtend(false), cbData(0), cbExtra(0)
+		StringTable( POLE::Stream* tableStream, unsigned int fc, unsigned int lcb, int nWordVersion, bool bReadExta = false) :
+												code_page(1250), fExtend(false), cbData(0), cbExtra(0), DataExtra(NULL)
 		{
 			if ( lcb > 0 )
 			{
 				VirtualStreamReader reader( tableStream, fc, nWordVersion);
 
-				parse( &reader, fc, lcb ) ;
+				parse( &reader, fc, lcb, bReadExta ) ;
 			}
 		}
+		std::vector<unsigned char*> & getDataExtra() {return DataExtra;}
+		unsigned short getDataExtraSize() {return cbExtra;}
 
 		ByteStructure* operator [] ( size_t index ) const
 		{
@@ -96,7 +109,7 @@ namespace DocFileFormat
 
 	private:
 		
-		void parse( VirtualStreamReader *reader, unsigned int fc, unsigned int lcb = 0 )
+		void parse( VirtualStreamReader *reader, unsigned int fc, unsigned int lcb = 0, bool bReadExta = false )
 		{
 			if ( reader == NULL )		return;
 			if (fc > reader->GetSize()) return;
@@ -191,8 +204,15 @@ namespace DocFileFormat
 
 				reader->Seek( (int)( posBeforeType + cbData ), 0/*STREAM_SEEK_SET */);
 	        
-				
-				reader->ReadBytes( cbExtra, false );//skip the extra unsigned char
+				if (bReadExta)
+				{
+					unsigned char* pData = reader->ReadBytes( cbExtra, true );
+					DataExtra.push_back(pData);
+				}
+				else
+				{
+					reader->ReadBytes( cbExtra, false );
+				}
 			}
 		}
 	};

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp

@@ -75,7 +75,7 @@ namespace DocFileFormat
 	void TableCellPropertiesMapping::Apply (IVisitable* visited)
 	{
 		TablePropertyExceptions* tapx	=	static_cast<TablePropertyExceptions*>(visited);
-		int nComputedCellWidth			=	0;
+		int nComputedCellWidth = 0, nComputedCellWidths = 0;
 
 		_gridSpan = 0;
 		_bCoverCell = false;
@@ -164,7 +164,11 @@ namespace DocFileFormat
 					else
 					{
 						_gridSpan = 1;
-						nComputedCellWidth += tdef.rgdxaCenter[ _cellIndex + 1] - tdef.rgdxaCenter[ _cellIndex ] ;
+
+						nComputedCellWidths +=  (tdef.rgdxaCenter[ _cellIndex + 1] - tdef.rgdxaCenter[ 0 ]);
+						nComputedCellWidth	+= tdef.rgTc80[ _cellIndex].wWidth > 1 ? tdef.rgTc80[ _cellIndex].wWidth : (tdef.rgdxaCenter[ _cellIndex + 1] - tdef.rgdxaCenter[ _cellIndex ]);
+						//Технические_Требования_1_287_ДИТ.DOC
+
 					}
 
 					if (!IsTableBordersDefined(tapx->grpprl))
@@ -348,19 +352,22 @@ namespace DocFileFormat
 		tcW.AppendAttribute( tcWVal );
 		_tcPr->AppendChild( tcW );
 
+		int nComputedCellWidthsGrid = 0;
 
-		if ( _gridSpan == 1 && ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidth > _grid->at( _gridIndex ) ) )
+		for (size_t ccc = 0; ccc < _grid->size() && ccc <= _gridIndex; ccc++)
+		{
+			nComputedCellWidthsGrid += _grid->at(ccc);
+		}
+		if ( _gridSpan == 1 && ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidths > nComputedCellWidthsGrid ) )
 		{
 			//check the number of merged cells
-			int w = _grid->at( _gridIndex );
-
 			for ( size_t i = _gridIndex + 1; i < _grid->size(); i++ )
 			{
 				_gridSpan++;
 
-				w += _grid->at( i );
+				nComputedCellWidthsGrid += _grid->at( i );
 
-				if ( w >= nComputedCellWidth )
+				if ( nComputedCellWidthsGrid >= nComputedCellWidths )
 				{
 					break;
 				}

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp

@@ -67,7 +67,7 @@ namespace DocFileFormat
         XMLTools::XMLAttribute layoutType	( L"w:type", L"fixed");
 		bool bLayoutFixed = true;
 
-		short tblIndent		= 0;
+		_CP_OPT(short) tblIndent;
 		short gabHalf		= 0;
 		short marginLeft	= 0;
 		short marginRight	= 0;
@@ -98,8 +98,7 @@ namespace DocFileFormat
 					//For this cases we can calculate the indent of the table by getting the 
 					//first boundary of the TDef and adding the padding of the cells
 					
-					tblIndent = FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize );
-					tblIndent += gabHalf;
+					tblIndent = gabHalf + FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize );
 					//If there follows a real sprmTWidthIndent, this value will be overwritten
 
                     //tblIndent = (std::max)((int)tblIndent,0); //cerere.doc
@@ -404,11 +403,11 @@ namespace DocFileFormat
 		}
 
 	//indent
-		if ( tblIndent != 0 )
+		if ( tblIndent )
 		{
             XMLTools::XMLElement tblInd( L"w:tblInd");
 
-            XMLTools::XMLAttribute tblIndW( L"w:w", FormatUtils::IntToWideString( tblIndent ) );
+            XMLTools::XMLAttribute tblIndW( L"w:w", FormatUtils::IntToWideString( *tblIndent ) );
 			tblInd.AppendAttribute( tblIndW );
 
             XMLTools::XMLAttribute tblIndType( L"w:type", L"dxa");

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -220,15 +220,12 @@ namespace DocFileFormat
 		return res;
 	}
 //---------------------------------------------------------------
-	void VMLPictureMapping::appendStyleProperty(std::wstring* b, const std::wstring& propName, const std::wstring& propValue) const
+	void VMLPictureMapping::appendStyleProperty(std::wstring& style, const std::wstring& propName, const std::wstring& propValue) const
 	{
-		if ( b != NULL )
-		{
-			b->operator += ( propName );
-			b->operator += ( L":" );
-			b->operator += ( propValue );
-			b->operator +=( L";" );
-		}
+		style += ( propName );
+		style += ( L":" );
+		style += ( propValue );
+		style +=( L";" );
 	}
 
 	VMLPictureMapping::VMLPictureMapping(ConversionContext* ctx, XMLTools::CStringXmlWriter* writer, bool olePreview, IMapping* caller, bool isInlinePicture) : PropertiesMapping(writer)
@@ -295,6 +292,7 @@ namespace DocFileFormat
 
 			type.Convert( vmlShapeTypeMapping );
 			RELEASEOBJECT( vmlShapeTypeMapping );
+
 		}
 		else if (pict->embeddedData)
 		{
@@ -324,7 +322,7 @@ namespace DocFileFormat
 			{
 			case wzEquationXML:
 				{
-					ODRAW::xmlString *pXml = dynamic_cast<ODRAW::xmlString*>(iter.get());
+					ODRAW::XmlString *pXml = dynamic_cast<ODRAW::XmlString*>(iter.get());
 					if (pXml)
 					{
 						m_isEquation = true;
@@ -340,7 +338,7 @@ namespace DocFileFormat
 				}break;
 			case metroBlob:
 				{//встроенная неведомая хуйня
-					ODRAW::metroBlob* blob = dynamic_cast<ODRAW::metroBlob*>(iter.get());
+					ODRAW::MetroBlob* blob = dynamic_cast<ODRAW::MetroBlob*>(iter.get());
 					if (blob)
 					{						
 						m_isBlob		= true;
@@ -420,23 +418,23 @@ namespace DocFileFormat
 					std::wstring v = strHeight;
 					strHeight = strWidth; strWidth = v;
 
-					appendStyleProperty(&strStyle, L"rotation", FormatUtils::DoubleToWideString(dAngle));
+					appendStyleProperty(strStyle, L"rotation", FormatUtils::DoubleToWideString(dAngle));
 				}break;
 			case posh:
 				{
-					appendStyleProperty(&strStyle, L"mso-position-horizontal", VMLShapeMapping::mapHorizontalPosition((PositionHorizontal)iter->op));
+					appendStyleProperty(strStyle, L"mso-position-horizontal", VMLShapeMapping::mapHorizontalPosition((PositionHorizontal)iter->op));
 				}break;
 			case posrelh:
 				{
-					appendStyleProperty(&strStyle, L"mso-position-horizontal-relative", VMLShapeMapping::mapHorizontalPositionRelative((PositionHorizontalRelative)iter->op));
+					appendStyleProperty(strStyle, L"mso-position-horizontal-relative", VMLShapeMapping::mapHorizontalPositionRelative((PositionHorizontalRelative)iter->op));
 				}break;
 			case posv:
 				{
-					appendStyleProperty(&strStyle, L"mso-position-vertical", VMLShapeMapping::mapVerticalPosition((PositionVertical)iter->op));
+					appendStyleProperty(strStyle, L"mso-position-vertical", VMLShapeMapping::mapVerticalPosition((PositionVertical)iter->op));
 				}break;
 			case posrelv:
 				{
-					appendStyleProperty(&strStyle, L"mso-position-vertical-relative", VMLShapeMapping::mapVerticalPositionRelative((PositionVerticalRelative)iter->op));
+					appendStyleProperty(strStyle, L"mso-position-vertical-relative", VMLShapeMapping::mapVerticalPositionRelative((PositionVerticalRelative)iter->op));
 				}break;
 			case groupShapeBooleans:
 				{
@@ -445,7 +443,7 @@ namespace DocFileFormat
 					if (booleans->fUsefBehindDocument && booleans->fBehindDocument)
 					{
 						//The shape is behind the text, so the z-index must be negative.
-						appendStyleProperty(&strStyle, L"z-index", L"-1" );
+						appendStyleProperty(strStyle, L"z-index", L"-1" );
 					}
 					//else if (!m_isInlinePicture)
 					//{
@@ -454,7 +452,7 @@ namespace DocFileFormat
 
 					if (booleans->fHidden && booleans->fUsefHidden)
 					{
-						appendStyleProperty(&strStyle, L"visibility", L"hidden");
+						appendStyleProperty(strStyle, L"visibility", L"hidden");
 					}
 				}break;
 			default:
@@ -499,7 +497,8 @@ namespace DocFileFormat
 			appendValueAttribute(m_imageData, L"o:title", L"" );
 			m_pXmlWriter->WriteString(m_imageData->GetXMLString());
 		}
-
+		else
+			m_isPictureBroken = true;
 
 		{//borders			
 			writePictureBorder( L"bordertop",		pict->brcTop );
@@ -558,10 +557,10 @@ namespace DocFileFormat
 				pict->embeddedDataSize += lLenHeader;
 				delete []pict->embeddedData;
 				pict->embeddedData = newData;
-
 			}
-			m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(Global::msoblipDIB), 
-					std::vector<unsigned char>(pict->embeddedData, (pict->embeddedData + pict->embeddedDataSize)), Global::msoblipDIB));
+
+			m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(btWin32), 
+				pict->embeddedData, pict->embeddedDataSize, btWin32));
 			
 			m_nImageId	=	m_context->_docx->RegisterImage(m_caller, btWin32);
 			result	=	true;
@@ -578,26 +577,44 @@ namespace DocFileFormat
 					if (metaBlip)
 					{//decompress inside MetafilePictBlip
 						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))));
-						
-						RELEASEARRAYOBJECTS(newData);
-					}
-				}
-				break;
+						unsigned int newDataSize = metaBlip->oMetaFile.ToBuffer(newData);
 
+						boost::shared_array<unsigned char> arData(newData);						
+						m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlipEntry->btWin32), arData, newDataSize));
+					}
+				}break;
+				case Global::msoblipDIB:
+				{//user_manual_v52.doc
+				
+  					BitmapBlip* bitBlip = static_cast<BitmapBlip*>(oBlipEntry->Blip);
+					if (bitBlip)
+					{
+						std::wstring file_name = m_context->_doc->m_sTempFolder + L"tmp_image";
+						oBlipEntry->btWin32 = ImageHelper::SaveImageToFileFromDIB(bitBlip->m_pvBits, bitBlip->pvBitsSize, file_name);
+
+						if (oBlipEntry->btWin32 == Global::msoblipPNG)
+						{
+							unsigned char* pData = NULL;
+							DWORD nData = 0;
+							if (NSFile::CFileBinary::ReadAllBytes(file_name, &pData, nData))
+							{
+								m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(Global::msoblipPNG), 
+									boost::shared_array<unsigned char>(pData), nData, Global::msoblipPNG));
+								break;
+							}
+						}
+					}				
+				}//в случае ошибки конвертации -храним оригинальный dib
 				case Global::msoblipJPEG:
 				case Global::msoblipCMYKJPEG:
 				case Global::msoblipPNG:
 				case Global::msoblipTIFF:
-				case Global::msoblipDIB:
 				{
 					BitmapBlip* bitBlip = static_cast<BitmapBlip*>(oBlipEntry->Blip);
 					if (bitBlip)
 					{
 						m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlipEntry->btWin32), 
-							std::vector<unsigned char>(bitBlip->m_pvBits, (bitBlip->m_pvBits + bitBlip->pvBitsSize)), oBlipEntry->btWin32));
+							bitBlip->m_pvBits, bitBlip->pvBitsSize, oBlipEntry->btWin32));
 					}
 				}break;			
 

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.h

@@ -56,7 +56,7 @@ namespace DocFileFormat
 	private:
 		/// Writes a border element
 		void writePictureBorder (const std::wstring & name, const BorderCode* brc);
-		void appendStyleProperty( std::wstring* b, const std::wstring& propName, const std::wstring& propValue ) const;
+		void appendStyleProperty( std::wstring& style, const std::wstring& propName, const std::wstring& propValue ) const;
 		bool ParseEmbeddedEquation( const std::string & xmlString, std::wstring & newXmlString );
 		bool ParseEmbeddedBlob(const std::string & xmlString, std::wstring & newXmlString);
 		std::wstring GetShapeID(const Shape* pShape) const;
@@ -74,6 +74,7 @@ namespace DocFileFormat
 		bool							m_isBullete;
 		bool							m_isEquation;
 		bool							m_isEmbedded;
+		bool							m_isPictureBroken;
 		std::string						m_embeddedData;
 		std::wstring					m_equationXml;
 		std::wstring					m_blobXml;

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -52,6 +52,7 @@ namespace DocFileFormat
 	{		
 		m_isInlineShape		=	isInlineShape;
 		m_isBullete			=	false;
+		m_isPictureBroken	=	false;
 
 		m_pSpa				=	pSpa;
 		m_pCaller			=	pCaller;
@@ -277,6 +278,7 @@ namespace DocFileFormat
 		bool layoutInCell		=	true; //anmeldebogenfos.doc
 		bool b3D				=	false;
 		bool bShadow			=	false;
+		bool bPicturePresent	=	false;
 		
 		int ndxTextLeft			=	-1;
 		int ndyTextTop			=	-1;
@@ -565,10 +567,12 @@ namespace DocFileFormat
 					{
 						appendValueAttribute(&m_fill, L"r:id", std::wstring(( L"rId" ) + FormatUtils::IntToWideString(m_nImageId) ));
 					}
+
+					bPicturePresent = true;
 				}break;
 			case fillBlipName:
 				{
-					ODRAW::anyString* str = dynamic_cast<ODRAW::anyString*>(iter.get());
+					ODRAW::AnyString* str = dynamic_cast<ODRAW::AnyString*>(iter.get());
 					if ((str) && (!str->string_.empty()))
 					{
 						appendValueAttribute(&m_fill, L"o:title", FormatUtils::XmlEncode(str->string_));
@@ -647,10 +651,11 @@ namespace DocFileFormat
 							appendValueAttribute(&m_imagedata, L"r:id", ( std::wstring( L"rId" ) + FormatUtils::IntToWideString(m_nImageId) ));
 						}
 					}
+					bPicturePresent = true;
 				}break;
 			case pibName:
 				{
-					ODRAW::anyString* str = dynamic_cast<ODRAW::anyString*>(iter.get());
+					ODRAW::AnyString* str = dynamic_cast<ODRAW::AnyString*>(iter.get());
 					if ((str) && (!str->string_.empty()))
 					{
 						appendValueAttribute(&m_imagedata, L"o:title", FormatUtils::XmlEncode(str->string_));
@@ -665,7 +670,7 @@ namespace DocFileFormat
 				{
                     ODRAW::ThreeDObjectBooleanProperties* booleans = dynamic_cast<ODRAW::ThreeDObjectBooleanProperties*>(iter.get());
 
-					if (booleans->fUsef3D && !booleans->f3D)
+					if ((booleans) && (booleans->fUsef3D && !booleans->f3D))
 						b3D = false;
 				}break;
 			case c3DRenderMode:
@@ -751,18 +756,18 @@ namespace DocFileFormat
 						break;
 					case 1:
 					case 5://верт (склони голову направо)						
-						appendStyleProperty(&sTextboxStyle, L"layout-flow", L"vertical");
+						appendStyleProperty(sTextboxStyle, L"layout-flow", L"vertical");
 						break;
 					case 2://верт (склони голову налево)	
-						appendStyleProperty(&sTextboxStyle, L"layout-flow", L"vertical");
-						appendStyleProperty(&sTextboxStyle, L"mso-layout-flow-alt", L"bottom-to-top");
+						appendStyleProperty(sTextboxStyle, L"layout-flow", L"vertical");
+						appendStyleProperty(sTextboxStyle, L"mso-layout-flow-alt", L"bottom-to-top");
 						break;
 					}
 				}break;	
 // Word Art
 			case gtextUNICODE:
 				{
-					ODRAW::anyString* str = dynamic_cast<ODRAW::anyString*>(iter.get());
+					ODRAW::AnyString* str = dynamic_cast<ODRAW::AnyString*>(iter.get());
 					if ((str) && (!str->string_.empty()))
 					{
 						std::wstring text = FormatUtils::XmlEncode(str->string_);
@@ -776,7 +781,7 @@ namespace DocFileFormat
 				}break;
 			case gtextFont:
 				{
-					ODRAW::anyString* str = dynamic_cast<ODRAW::anyString*>(iter.get());
+					ODRAW::AnyString* str = dynamic_cast<ODRAW::AnyString*>(iter.get());
 					if ((str) && (!str->string_.empty()))
 					{
 						std::wstring font = str->string_;
@@ -789,18 +794,18 @@ namespace DocFileFormat
 						if (i < font.size()) font.erase(font.begin() + i, font.end());
 
 						font = std::wstring(L"\"") + font + std::wstring(L"\"");
-						appendStyleProperty(&m_textPathStyle, L"font-family", font);
+						appendStyleProperty(m_textPathStyle, L"font-family", font);
 					}
 				}break;
 			case gtextSize:
 				{
 					std::wstring fontSize = FormatUtils::IntToWideString(iter->op/65535);
-					appendStyleProperty(&m_textPathStyle, L"font-size", fontSize + L"pt");
+					appendStyleProperty(m_textPathStyle, L"font-size", fontSize + L"pt");
 				}break;
 			case gtextSpacing:
 				{
 					std::wstring spacing = FormatUtils::IntToWideString(iter->op);
-					appendStyleProperty(&m_textPathStyle, L"v-text-spacing", spacing + L"f");
+					appendStyleProperty(m_textPathStyle, L"v-text-spacing", spacing + L"f");
 				}break;
 			case geometryTextBooleanProperties:
 				{
@@ -815,20 +820,20 @@ namespace DocFileFormat
 					}
 					if (props->fUsegFVertical && props->fVertical)
 					{
-						appendStyleProperty(&m_textPathStyle, L"v-rotate-letters", L"t");
+						appendStyleProperty(m_textPathStyle, L"v-rotate-letters", L"t");
 						//_twistDimension = true;
 					}
 					if (props->fUsegFKern && props->fKern)
 					{
-						appendStyleProperty(&m_textPathStyle, L"v-text-kern", L"t");
+						appendStyleProperty(m_textPathStyle, L"v-text-kern", L"t");
 					}
 					if (props->fUsegFItalic && props->fItalic)
 					{
-						appendStyleProperty(&m_textPathStyle, L"font-style", L"italic");
+						appendStyleProperty(m_textPathStyle, L"font-style", L"italic");
 					}
 					if (props->fUsegFBold && props->fBold)
 					{
-						appendStyleProperty(&m_textPathStyle, L"font-weight", L"bold");
+						appendStyleProperty(m_textPathStyle, L"font-weight", L"bold");
 					}
 				}break;
 			default:
@@ -873,10 +878,10 @@ namespace DocFileFormat
 			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString( *xCoord ) + L"," + FormatUtils::IntToWideString( *yCoord ) ));
 		} 
 
-		int nCode	=	0;
+		int nCode =	0;
 		if (pShape->GetShapeType())
 		{
-			nCode	=	pShape->GetShapeType()->GetTypeCode();
+			nCode =	pShape->GetShapeType()->GetTypeCode();
 		}
 
 		if (DocFileFormat::msosptRoundRectangle == nCode)
@@ -886,6 +891,11 @@ namespace DocFileFormat
 				m_pXmlWriter->WriteAttribute(L"arcsize", m_nAdjValues[0]);
 			}
 		}
+		else if (DocFileFormat::msosptPictureFrame == nCode)
+		{
+			if (bPicturePresent == false)
+				m_isPictureBroken = true;
+		}
 		else
 		{
 			if (nAdjValues > 0)												
@@ -1261,14 +1271,16 @@ namespace DocFileFormat
 	/// Build the VML wrapcoords string for a given pWrapPolygonVertices
 	std::wstring VMLShapeMapping::GetWrapCoords(const ODRAW::OfficeArtFOPTEPtr& pOpt) const
 	{
-		ODRAW::pWrapPolygonVertices* pWrapPolygonVertices = dynamic_cast<ODRAW::pWrapPolygonVertices*>(pOpt.get());
+		ODRAW::PWrapPolygonVertices* pWrapPolygonVertices = dynamic_cast<ODRAW::PWrapPolygonVertices*>(pOpt.get());
+		
 		if (!pWrapPolygonVertices) return L"";
+		if (pWrapPolygonVertices->complex.data.empty()) return L"";
 
 		std::wstring coords;
 
 		for (size_t i = 0; i < pWrapPolygonVertices->complex.data.size(); ++i)
 		{
-			coords += FormatUtils::IntToWideString(pWrapPolygonVertices->complex.data[i++].x);
+			coords += FormatUtils::IntToWideString(pWrapPolygonVertices->complex.data[i].x);
 			coords += L",";
 			coords += FormatUtils::IntToWideString(pWrapPolygonVertices->complex.data[i].y);
 			coords += L",";
@@ -1281,7 +1293,7 @@ namespace DocFileFormat
 
 	/// Copies the picture from the binary stream to the zip archive 
 	/// and creates the relationships for the image.
-	bool VMLShapeMapping::copyPicture(const BlipStoreEntry* oBlip)
+	bool VMLShapeMapping::copyPicture(BlipStoreEntry* oBlip)
 	{
 		bool result = false;
 
@@ -1292,9 +1304,9 @@ namespace DocFileFormat
 
 			switch (oBlip->btWin32)
 			{
-			case Global::msoblipEMF:
-			case Global::msoblipWMF:
-			case Global::msoblipPICT:
+				case Global::msoblipEMF:
+				case Global::msoblipWMF:
+				case Global::msoblipPICT:
 				{
 					//it's a meta image
 					MetafilePictBlip* metaBlip = static_cast<MetafilePictBlip*>(RecordFactory::ReadRecord(&reader, 0));
@@ -1302,38 +1314,53 @@ namespace DocFileFormat
 					{
 						//meta images can be compressed
 						unsigned char* decompressed = NULL;
-						int decompressedSize = 0;
+						unsigned int decompressedSize = 0;
 
 						decompressedSize = metaBlip->Decompress(&decompressed);
+
 						if (0 != decompressedSize && NULL != decompressed)
 						{
-							m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlip->btWin32), std::vector<unsigned char>(decompressed, (decompressed + decompressedSize))));
-							RELEASEARRAYOBJECTS(decompressed);
+							boost::shared_array<unsigned char> arDecompressed(decompressed);
+							m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlip->btWin32), arDecompressed, decompressedSize));
 						}
 
 						RELEASEOBJECT(metaBlip);
 					}
 				}
 				break;
-
-			case Global::msoblipJPEG:
-			case Global::msoblipCMYKJPEG:
-			case Global::msoblipPNG:
-			case Global::msoblipTIFF:
-			case Global::msoblipDIB:
-				{
-					//it's a bitmap image
+				case Global::msoblipJPEG:
+				case Global::msoblipCMYKJPEG:
+				case Global::msoblipPNG:
+				case Global::msoblipTIFF:
+				case Global::msoblipDIB:
+				{//it's a bitmap image					
 					BitmapBlip* bitBlip = static_cast<BitmapBlip*>(RecordFactory::ReadRecord(&reader, 0));
 					if ((bitBlip) && (bitBlip->m_pvBits))
 					{
+						if (oBlip->btWin32 == Global::msoblipDIB)
+						{
+							std::wstring file_name = m_context->_doc->m_sTempFolder + L"tmp_image";
+
+							if (Global::msoblipPNG == ImageHelper::SaveImageToFileFromDIB(bitBlip->m_pvBits, bitBlip->pvBitsSize, file_name))
+							{
+								oBlip->btWin32 = Global::msoblipPNG;
+
+								unsigned char* pData = NULL;
+								DWORD nData = 0;
+								if (NSFile::CFileBinary::ReadAllBytes(file_name, &pData, nData))
+								{
+									m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(Global::msoblipPNG), 
+										boost::shared_array<unsigned char>(pData), nData, Global::msoblipPNG));
+									break;
+								}
+							}//в случае ошибки конвертации -храним оригинальный dib
+						}
 						m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlip->btWin32), 
-							std::vector<unsigned char>(bitBlip->m_pvBits, (bitBlip->m_pvBits + bitBlip->pvBitsSize)), oBlip->btWin32));
+							bitBlip->m_pvBits, bitBlip->pvBitsSize, oBlip->btWin32));
 						RELEASEOBJECT (bitBlip);
 					}
-				}
-				break;
-
-			default:
+				}break;				
+				default:
 				{
 					result = false;
 					return result;
@@ -1389,9 +1416,9 @@ namespace DocFileFormat
 		}
 	}
 
-	void VMLShapeMapping::AppendDimensionToStyle(std::wstring* style, const PictureDescriptor* pict, bool twistDimensions) const
+	void VMLShapeMapping::AppendDimensionToStyle(std::wstring& style, const PictureDescriptor* pict, bool twistDimensions) const
 	{
-		if ( ( style != NULL ) && ( pict != NULL ) )
+		if (  pict != NULL ) 
 		{
 			double xScaling = pict->mx / 1000.0;
 			double yScaling = pict->my / 1000.0;
@@ -1408,26 +1435,23 @@ namespace DocFileFormat
 			std::wstring widthString = FormatUtils::DoubleToWideString( width.ToPoints() );
 			std::wstring heightString = FormatUtils::DoubleToWideString( height.ToPoints() );
 
-			style->operator += ( std::wstring( L"width:" ) + widthString + std::wstring( L"pt;" ) );
-			style->operator += ( std::wstring( L"height:" ) + heightString + std::wstring( L"pt;" ) );
+			style += L"width:" + widthString + L"pt;" ;
+			style += L"height:" + heightString + L"pt;";
 		}
 	}
 
-	void VMLShapeMapping::AppendDimensionToStyle(std::wstring* style, const Spa* pSpa, bool twistDimensions) const
+	void VMLShapeMapping::AppendDimensionToStyle(std::wstring& style, const Spa* pSpa, bool twistDimensions) const
 	{
-		if ( ( style != NULL ) && (pSpa != NULL ) )
+		if (pSpa != NULL )
 		{
 			//append size and position ...
 
-			//if (pSpa->fAnchorLock )
-			//if (pSpa->bx == TEXT && pSpa->by == TEXT)
-			//{
+			if (m_isInlineShape)
+			{
 			//	appendStyleProperty( style, L"position", L"static" );
-			//}
-			//else
-			//{
-				appendStyleProperty( style, L"position", L"absolute" );
-			//}
+			}
+			else
+				appendStylePropertyFirst( style, L"position", L"absolute" );
 
 			TwipsValue left	 (pSpa->xaLeft);
 			TwipsValue top	 (pSpa->yaTop);
@@ -1450,9 +1474,9 @@ namespace DocFileFormat
 		}
 	}
 
-	void VMLShapeMapping::AppendDimensionToStyle(std::wstring* style, const ChildAnchor* anchor, bool twistDimensions) const
+	void VMLShapeMapping::AppendDimensionToStyle(std::wstring& style, const ChildAnchor* anchor, bool twistDimensions) const
 	{
-		if ((style != NULL) && (anchor != NULL))
+		if (anchor != NULL)
 		{
 			DocFileFormat::Rectangle bounds = anchor->rcgBounds;
 
@@ -1462,34 +1486,40 @@ namespace DocFileFormat
 				bounds.topLeftAngle.y	=	static_cast<LONG>(((anchor->Bottom	+	anchor->Top)  * 0.5 - (anchor->Right	-	anchor->Left) * 0.5));
 			}
 
-			appendStyleProperty(style, L"position", L"absolute");
-			appendStyleProperty(style, L"left",	FormatUtils::IntToWideString(bounds.topLeftAngle.x));
-			appendStyleProperty(style, L"top",	FormatUtils::IntToWideString(bounds.topLeftAngle.y));
+			appendStylePropertyFirst(style, L"top",	FormatUtils::IntToWideString(bounds.topLeftAngle.y));
+			appendStylePropertyFirst(style, L"left",	FormatUtils::IntToWideString(bounds.topLeftAngle.x));
+			appendStylePropertyFirst(style, L"position", L"absolute");
 
 			if (twistDimensions)
 			{
-				appendStyleProperty(style, L"width",	 FormatUtils::IntToWideString(bounds.size.cy));
-				appendStyleProperty(style, L"height", FormatUtils::IntToWideString(bounds.size.cx));
+				appendStylePropertyFirst(style, L"width",	 FormatUtils::IntToWideString(bounds.size.cy));
+				appendStylePropertyFirst(style, L"height", FormatUtils::IntToWideString(bounds.size.cx));
 			}
 			else
 			{
-				appendStyleProperty(style, L"width",  FormatUtils::IntToWideString(bounds.size.cx));
-				appendStyleProperty(style, L"height", FormatUtils::IntToWideString(bounds.size.cy));
+				appendStylePropertyFirst(style, L"width",  FormatUtils::IntToWideString(bounds.size.cx));
+				appendStylePropertyFirst(style, L"height", FormatUtils::IntToWideString(bounds.size.cy));
 			}
 		}
 	}
 
-	void VMLShapeMapping::appendStyleProperty(std::wstring* b, const std::wstring& propName, const std::wstring& propValue) const
+	void VMLShapeMapping::appendStyleProperty(std::wstring& style, const std::wstring& propName, const std::wstring& propValue) const
 	{
-		if ( b != NULL )
-		{
-			b->operator += ( propName );
-			b->operator += ( L":" );
-			b->operator += ( propValue );
-			b->operator +=( L";" );
-		}
+		style += ( propName );
+		style += ( L":" );
+		style += ( propValue );
+		style +=( L";" );
+	}
+	void VMLShapeMapping::appendStylePropertyFirst(std::wstring& style, const std::wstring& propName, const std::wstring& propValue) const
+	{
+		std::wstring s;
+		s += ( propName );
+		s += ( L":" );
+		s += ( propValue );
+		s +=( L";" );
+		
+		style = s + style;
 	}
-
 	std::wstring VMLShapeMapping::getTextboxAnchor(unsigned int anchor) const
 	{
 		switch ( anchor )
@@ -1558,22 +1588,22 @@ namespace DocFileFormat
 		PositionHorizontalRelative hRel = (PositionHorizontalRelative )hRel_;
 		switch ( hRel ) 
 		{
-			case msoprhMargin:	return L"margin";
-			case msoprhPage:	return L"page";
-			case msoprhText:	return L"text";
-			case msoprhChar:	return L"char";
+			case msoprhMargin:	return L"margin";	//0 //MARGIN = anchor
+			case msoprhPage:	return L"page";		//1 //PAGE
+			case msoprhText:	return L"text";		//2 //TEXT
+			case msoprhChar:	return L"char";		//3
 			default:
 				return L"margin";
 		}
 	}
 
-	void VMLShapeMapping::AppendOptionsToStyle (std::wstring* oStyle, const std::vector<ODRAW::OfficeArtFOPTEPtr>& options, int zIndex) const
+	void VMLShapeMapping::AppendOptionsToStyle (std::wstring& oStyle, const std::vector<ODRAW::OfficeArtFOPTEPtr>& options, int zIndex) const
 	{
-		bool bRelH = false;
-		bool bRelV = false;
+		int nRelH = -1;
+		int nRelV = -1;
 
-		bool bPosH = false;
-		bool bPosV = false;
+		int nPosH = -1;
+		int nPosV = -1;
 
 		bool bZIndex = false;
 
@@ -1585,36 +1615,40 @@ namespace DocFileFormat
 //	POSITIONING
 			case posh:
 				{
-					appendStyleProperty(oStyle, L"mso-position-horizontal", mapHorizontalPosition((PositionHorizontal)iter->op));
-					bPosH = true;
+					nPosH = iter->op;
 				}break;
 			case posrelh:
 				{
+					nRelH = iter->op;
 					appendStyleProperty(oStyle, L"mso-position-horizontal-relative", mapHorizontalPositionRelative((PositionHorizontalRelative)iter->op));
-					bRelH = true;
 				}break;
 			case posv:
 				{
-					appendStyleProperty(oStyle, L"mso-position-vertical", mapVerticalPosition((PositionVertical)iter->op));
-					bPosV = true;
+					nPosV = iter->op;
 				}break;
 			case posrelv:
 				{
+					nRelV = iter->op;
 					appendStyleProperty(oStyle, L"mso-position-vertical-relative", mapVerticalPositionRelative((PositionVerticalRelative)iter->op));
-					bRelV = true;
 				}break;
 //	BOOLEANS
 			case groupShapeBooleans:
 				{
 					ODRAW::GroupShapeBooleanProperties* booleans = dynamic_cast<ODRAW::GroupShapeBooleanProperties*>(iter.get());
 
-					if (booleans->fUsefBehindDocument && booleans->fBehindDocument && !bZIndex)
+					if (booleans->fUsefBehindDocument && booleans->fBehindDocument)
 					{
-						//The shape is behind the text, so the z-index must be negative.
-						appendStyleProperty(oStyle, L"z-index", L"-1" );
-						bZIndex = true;
+						//за текстом (The shape is behind the text, so the z-index must be negative.)
+						m_isInlineShape = false;
+
+						if (!bZIndex)
+						{
+							appendStyleProperty(oStyle, L"z-index", FormatUtils::IntToWideString(-zIndex - 0x7ffff));
+							bZIndex = true;
+						}
 					}
-					else if (!m_isInlineShape && !bZIndex)
+					
+					if (!m_isInlineShape && !bZIndex)
 					{
 						appendStyleProperty( oStyle, L"z-index", FormatUtils::IntToWideString(zIndex + 0x7ffff));
 						bZIndex = true;
@@ -1662,13 +1696,25 @@ namespace DocFileFormat
 			}
 		}
 		
-		if (!bRelH && m_pSpa)
+		if (nRelH < 0 && m_pSpa)
 		{
-			appendStyleProperty(oStyle, L"mso-position-horizontal-relative", mapHorizontalPositionRelative(m_pSpa->bx));
+			if (m_pSpa->bx == TEXT && bZIndex)
+			{
+				m_pSpa->bx = PAGE;
+			}
+			else
+			{//rel column
+			}
 		}
-		if (!bRelV && m_pSpa)
+		if (nRelV < 0 && m_pSpa)
 		{
-			appendStyleProperty(oStyle, L"mso-position-vertical-relative", mapVerticalPositionRelative(m_pSpa->by));
+			if (m_pSpa->by == TEXT && bZIndex) 
+			{
+				m_pSpa->by = PAGE;
+			}
+			else
+			{//rel paragraph
+			}
 		}
 		if (!m_isInlineShape && !bZIndex)
 		{
@@ -1676,6 +1722,19 @@ namespace DocFileFormat
 			bZIndex = true;
 		}
 
+		if (nRelH == 3 && nRelV == 3)
+		{
+			m_isInlineShape = true;
+		}
+
+		if (nPosH >= 0 && !m_isInlineShape)
+		{
+			appendStyleProperty(oStyle, L"mso-position-horizontal", mapHorizontalPosition((PositionHorizontal)nPosH));
+		}
+		if (nPosV >= 0 && !m_isInlineShape)
+		{
+			appendStyleProperty(oStyle, L"mso-position-vertical", mapVerticalPosition((PositionVertical)nPosV));
+		}
 		//if (!bPosH)
 		//{
 		//	appendStyleProperty(oStyle, L"mso-position-horizontal", L"absolute" );
@@ -1719,26 +1778,38 @@ namespace DocFileFormat
 			}
 		}
 
+		if ( shape->fFlipH )
+		{
+			appendStyleProperty( style, L"flip", L"x" );
+		}
+
+		if ( shape->fFlipV )
+		{
+			appendStyleProperty( style, L"flip", L"y" );
+		}
+
+		AppendOptionsToStyle( style, options, zIndex );
+		
 		//don't append the dimension info to lines, 
 		// because they have "from" and "to" attributes to decline the dimension
-		if(!shape->is<LineType>())
+		if(false == shape->is<LineType>())
 		{
 			if ( (m_pSpa != NULL) && ( anchor == NULL ) )
 			{
 				//this shape is placed directly in the document, 
 				//so use the FSPA to build the style
-				AppendDimensionToStyle(&style, m_pSpa, twistDimensions);
+				AppendDimensionToStyle( style, m_pSpa, twistDimensions);
 			}
 			else if (anchor)
 			{
 				//the style is part of a group, 
 				//so use the anchor
-				AppendDimensionToStyle(&style, anchor, twistDimensions);
+				AppendDimensionToStyle( style, anchor, twistDimensions);
 			}
 			else if (m_pict)
 			{
 				// it is some kind of PICT shape (e.g. WordArt)
-				AppendDimensionToStyle(&style, m_pict, twistDimensions);
+				AppendDimensionToStyle( style, m_pict, twistDimensions);
 			}
 		}
 		else
@@ -1746,36 +1817,23 @@ namespace DocFileFormat
 			//если не написать тип позиции, то будет inline
 			if ( anchor != NULL )
 			{
-				appendStyleProperty( &style, L"position", L"absolute" );
+				appendStylePropertyFirst( style, L"position", L"absolute" );
 			}
 			else if (m_pSpa)
 			{
 				//append size and position ...
 				//if (m_pSpa->fAnchorLock)//это возможность смены привязки , а не ее тип
 
-				//if (m_pSpa->bx == TEXT && m_pSpa->by == TEXT)
-				//{
-				//	appendStyleProperty( &style, L"position", L"static" );
-				//}
-				//else
+				if (m_isInlineShape)/*m_pSpa->bx == TEXT && m_pSpa->by == TEXT*/
 				{
-					appendStyleProperty( &style, L"position", L"absolute" );
+				//	appendStyleProperty( style, L"position", L"static" );
+				}
+				else
+				{
+					appendStylePropertyFirst( style, L"position", L"absolute" );
 				}
 			}
 		}
-
-		if ( shape->fFlipH )
-		{
-			appendStyleProperty( &style, L"flip", L"x" );
-		}
-
-		if ( shape->fFlipV )
-		{
-			appendStyleProperty( &style, L"flip", L"y" );
-		}
-
-		AppendOptionsToStyle( &style, options, zIndex );
-		
 		return style;
 	}
 
@@ -1842,7 +1900,7 @@ namespace DocFileFormat
 
 	std::wstring VMLShapeMapping::getFillColorString(const ODRAW::OfficeArtFOPTEPtr& pOpt)  const
 	{
-		ODRAW::fillShadeColors* pColors = dynamic_cast<ODRAW::fillShadeColors*>(pOpt.get());
+		ODRAW::FillShadeColors* pColors = dynamic_cast<ODRAW::FillShadeColors*>(pOpt.get());
 		if (!pColors) return L"";
 		
 		std::wstring result;
@@ -1923,7 +1981,7 @@ namespace DocFileFormat
 	}
 	std::wstring VMLShapeMapping::GetConnectAngles(const ODRAW::OfficeArtFOPTEPtr& pOpt) const
 	{
-		ODRAW::pConnectionSitesDir* pAngles = dynamic_cast<ODRAW::pConnectionSitesDir*>(pOpt.get());
+		ODRAW::PConnectionSitesDir* pAngles = dynamic_cast<ODRAW::PConnectionSitesDir*>(pOpt.get());
 		if (!pAngles) return L"";
 		
 		std::wstring angles;
@@ -1951,7 +2009,7 @@ namespace DocFileFormat
 	}
 	void VMLShapeMapping::GetGuides( const ODRAW::OfficeArtFOPTEPtr& pOpt )
 	{
-		ODRAW::pGuides* pGuides = dynamic_cast<ODRAW::pGuides*>(pOpt.get());
+		ODRAW::PGuides* pGuides = dynamic_cast<ODRAW::PGuides*>(pOpt.get());
 		if (!pGuides) return;
 
 		m_arrGuides = pGuides->complex.data;
@@ -1975,7 +2033,7 @@ namespace DocFileFormat
 
 	std::wstring VMLShapeMapping::GetConnectLocs( const ODRAW::OfficeArtFOPTEPtr& pOpt ) const
 	{
-		ODRAW::pConnectionSites* pConnection = dynamic_cast<ODRAW::pConnectionSites*>(pOpt.get());
+		ODRAW::PConnectionSites* pConnection = dynamic_cast<ODRAW::PConnectionSites*>(pOpt.get());
 		if (!pConnection) return L"";
 
 		std::wstring locs;
@@ -1996,7 +2054,7 @@ namespace DocFileFormat
 	{
 		std::vector<std::wstring> rectangles;
 		
-		ODRAW::pInscribe* pInscribe = dynamic_cast<ODRAW::pInscribe*>(pOpt.get());
+		ODRAW::PInscribe* pInscribe = dynamic_cast<ODRAW::PInscribe*>(pOpt.get());
 		if (!pInscribe) return rectangles;
 		
 		for (size_t i = 0; i < pInscribe->complex.data.size(); ++i)

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.h

@@ -67,6 +67,7 @@ namespace DocFileFormat
         static std::wstring mapHorizontalPositionRelative(int hRel );
 
 		bool			m_isBullete;
+		bool			m_isPictureBroken;
 		std::wstring	m_shapeId;
 	private:
 
@@ -79,18 +80,19 @@ namespace DocFileFormat
 		void WriteShape (const ShapeContainer* pContainer);
 
 		std::wstring GenShapeId(const Shape* pShape) const;
-		bool copyPicture( const BlipStoreEntry* bse );
+		bool copyPicture( BlipStoreEntry* bse );
 		std::wstring GetTargetExt( Global::BlipType _type ) const;
 		
-		void AppendDimensionToStyle	( std::wstring* style, const PictureDescriptor* pict, bool twistDimensions ) const;
-		void AppendDimensionToStyle	( std::wstring* style, const Spa* pSpa, bool twistDimensions ) const;
-		void AppendDimensionToStyle	( std::wstring* style, const ChildAnchor* anchor, bool twistDimensions ) const;
-		void appendStyleProperty	( std::wstring* b, const std::wstring& propName, const std::wstring& propValue ) const;
+		void AppendDimensionToStyle	( std::wstring& style, const PictureDescriptor* pict, bool twistDimensions ) const;
+		void AppendDimensionToStyle	( std::wstring& style, const Spa* pSpa, bool twistDimensions ) const;
+		void AppendDimensionToStyle	( std::wstring& style, const ChildAnchor* anchor, bool twistDimensions ) const;
+		void appendStyleProperty	( std::wstring& style, const std::wstring& propName, const std::wstring& propValue ) const;
+		void appendStylePropertyFirst( std::wstring& style, const std::wstring& propName, const std::wstring& propValue ) const;
 		
 		std::wstring getTextboxAnchor( unsigned int anchor ) const;
 				
 		std::wstring buildStyle		( const Shape* shape, const ChildAnchor* anchor, const std::vector<ODRAW::OfficeArtFOPTEPtr>& options, int zIndex ) const;
-		void AppendOptionsToStyle	( std::wstring* style, const std::vector<ODRAW::OfficeArtFOPTEPtr>& options, int zIndex ) const;
+		void AppendOptionsToStyle	( std::wstring& style, const std::vector<ODRAW::OfficeArtFOPTEPtr>& options, int zIndex ) const;
 		
 		int UpdateFromGuides(const int val) const;
 
@@ -122,7 +124,7 @@ namespace DocFileFormat
 		int								m_nAdjValues[8];
 		std::vector<ODRAW::MSOSG>		m_arrGuides;
 		
-		bool							m_isInlineShape;
+		mutable bool					m_isInlineShape;
 		Spa*							m_pSpa;
 		IMapping*						m_pCaller;
 		BlipStoreContainer*				m_pBlipStore;

ASCOfficeDocFile/DocDocxConverter/VMLShapeTypeMapping.cpp

@@ -173,12 +173,16 @@ namespace DocFileFormat
 
 	//Lock ??? 
 			ODRAW::ProtectionBooleanProperties *prot = dynamic_cast<ODRAW::ProtectionBooleanProperties*>(pShape->Lock.get());
-			if ((prot) && (prot->fUsefLockAspectRatio && prot->fLockAspectRatio))
+			if ((prot) && (prot->fUsefLockAspectRatio))
 			{
-                appendValueAttribute( _lock, L"aspectratio", L"t" );
+				appendValueAttribute( _lock, L"aspectratio", prot->fLockAspectRatio ? L"t" : L"f" );
+			}
+			else
+			{
+				appendValueAttribute( _lock, L"aspectratio", L"t");
 			}
 
-			if ( _lock->GetAttributeCount() > 1 )
+			if ( _lock->GetAttributeCount() > 0 )
 			{
 				m_pXmlWriter->WriteString( _lock->GetXMLString() );
 			}

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -84,8 +84,8 @@ namespace DocFileFormat
 		Text(NULL), RevisionAuthorTable(NULL), FontTable(NULL), BookmarkNames(NULL), AutoTextNames(NULL), 
 		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),
+		EndnoteDocumentFieldsPlex(NULL), HeadersAndFootersDocumentFieldsPlex(NULL), HeaderStoriesPlex(NULL), AnnotationsFieldsPlex(NULL),
+		AnnotationsReferencePlex(NULL), AnnotationsReferencesEx(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),
@@ -297,10 +297,11 @@ namespace DocFileFormat
 		BookmarkNames		=	new StringTable<WideString>		(TableStream, FIB->m_FibWord97.fcSttbfBkmk,			FIB->m_FibWord97.lcbSttbfBkmk,			nWordVersion);
 		AutoTextNames		=	new StringTable<WideString>		(TableStream, FIB->m_FibWord97.fcSttbfGlsy,			FIB->m_FibWord97.lcbSttbfGlsy,			nWordVersion);
 		AssocNames			=	new StringTable<WideString>		(TableStream, FIB->m_FibWord97.fcSttbfAssoc,		FIB->m_FibWord97.lcbSttbfAssoc,			nWordVersion);
-		BookmarkAnnotNames	=	new StringTable<WideString>		(TableStream, FIB->m_FibWord97.fcSttbfAtnBkmk,		FIB->m_FibWord97.lcbSttbfAtnBkmk,		nWordVersion);
 		Captions			=	new StringTable<WideString>		(TableStream, FIB->m_FibWord97.fcSttbfCaption,		FIB->m_FibWord97.lcbSttbfCaption,		nWordVersion);
 		AutoCaptions		=	new StringTable<WideString>		(TableStream, FIB->m_FibWord97.fcSttbfAutoCaption,	FIB->m_FibWord97.lcbSttbfAutoCaption,	nWordVersion);
 
+		BookmarkAnnotNames	=	new StringTable<WideString>		(TableStream, FIB->m_FibWord97.fcSttbfAtnBkmk,		FIB->m_FibWord97.lcbSttbfAtnBkmk,		nWordVersion, true);
+		
 		if (m_pCallFunc)
 		{
 			m_pCallFunc->OnProgress (m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 100000);
@@ -344,16 +345,17 @@ namespace DocFileFormat
 			IndividualCommentsPlex			=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfandTxt,		FIB->m_FibWord97.lcbPlcfandTxt,		nWordVersion);
 		}
 
-		if (FIB->m_FibWord2002.lcbAtrdExtra > 0)
+		if (FIB->m_FibWord2002.lcbAtrdExtra > 0 && AnnotationsReferencePlex)
 		{
-			AnnotationsReferenceExPlex	=	new Plex<AnnotationReferenceExDescriptor>(AnnotationReferenceExDescriptor::GetSize(nWordVersion), TableStream, FIB->m_FibWord2002.fcAtrdExtra, FIB->m_FibWord2002.lcbAtrdExtra, nWordVersion);
+			size_t count = AnnotationsReferencePlex->Elements.size();
+			AnnotationsReferencesEx = new AnnotationReferenceExDescriptors(count, TableStream, FIB->m_FibWord2002.fcAtrdExtra, FIB->m_FibWord2002.lcbAtrdExtra);
 		}
 		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);
 
 		TextboxIndividualPlex				=	new Plex<FTXBXS>			(FTXBXS::STRUCTURE_SIZE,			TableStream, FIB->m_FibWord97.fcPlcftxbxTxt,	FIB->m_FibWord97.lcbPlcftxbxTxt,	nWordVersion);
 
-		SectionPlex							=	new Plex<SectionDescriptor>	(SectionDescriptor::GetSize(nWordVersion),	TableStream, FIB->m_FibWord97.fcPlcfSed,		FIB->m_FibWord97.lcbPlcfSed,		nWordVersion);
+		SectionPlex							=	new Plex<SectionDescriptor>	(SectionDescriptor::GetSize(nWordVersion),	TableStream, FIB->m_FibWord97.fcPlcfSed,FIB->m_FibWord97.lcbPlcfSed,		nWordVersion);
 		
 		BookmarkStartPlex					=	new Plex<BookmarkFirst>		(BookmarkFirst::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfBkf,		FIB->m_FibWord97.lcbPlcfBkf,		nWordVersion);
 		BookmarkEndPlex						=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfBkl,		FIB->m_FibWord97.lcbPlcfBkl,		nWordVersion);
@@ -361,36 +363,50 @@ 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);
 		
 
 		for (size_t i = 0; i < BookmarkStartPlex->Elements.size(); ++i)
 		{
-			BookmarkFirst* pBookmark		=	static_cast<BookmarkFirst*>(BookmarkStartPlex->Elements[i]);
+			BookmarkFirst* pBookmark = static_cast<BookmarkFirst*>(BookmarkStartPlex->Elements[i]);
 			if (pBookmark)
 			{
 				BookmarkStartEndCPs.push_back(std::make_pair(BookmarkStartPlex->CharacterPositions[i], BookmarkEndPlex->CharacterPositions[pBookmark->GetIndex()]));
 			}
 		}
+		std::vector<unsigned char*> & bookmarks = BookmarkAnnotNames->getDataExtra();
+
 		for (size_t i = 0; AnnotStartPlex && i < AnnotStartPlex->Elements.size(); ++i)
 		{
 			BookmarkFirst* pBookmark = static_cast<BookmarkFirst*>(AnnotStartPlex->Elements[i]);
 			if (pBookmark)
 			{
 				short ind = pBookmark->GetIndex();
-				if (i < AnnotStartPlex->CharacterPositions.size() -1 )
+
+				short bmc = *((short*)bookmarks[i]); //0x0100 always тут
+				_UINT32 lTag = *((_UINT32*)(bookmarks[i] + 2));
+
+				if (i < AnnotStartPlex->CharacterPositions.size() - 1 )
 				{
-					AnnotStartEndCPs.push_back(std::make_pair(AnnotStartPlex->CharacterPositions[i], AnnotEndPlex->CharacterPositions[i + 1]));
+					_annotStartEnd ann;
+					ann.start = AnnotStartPlex->CharacterPositions[i];
+					ann.end = AnnotEndPlex->CharacterPositions[i/* + 1*/];
+					ann.bookmarkId = lTag;
+					
+					AnnotStartEndCPs.push_back(ann);
 				}
 			}
 		}
 
 		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);
 		EndnoteDocumentFieldsPlex			=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldEdn, FIB->m_FibWord97.lcbPlcfFldEdn, nWordVersion);
 		HeadersAndFootersDocumentFieldsPlex	=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldHdr, FIB->m_FibWord97.lcbPlcfFldHdr, nWordVersion);
+		AnnotationsFieldsPlex				=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldAtn, FIB->m_FibWord97.lcbPlcfFldAtn, nWordVersion);
+		
 		ListPlex							=	new Plex<ListNumCache>	(ListNumCache::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfBteLvc, FIB->m_FibWord97.lcbPlcfBteLvc, nWordVersion);
 		
 		if (m_pCallFunc)
@@ -850,7 +866,6 @@ namespace DocFileFormat
 
 			RELEASEOBJECT(AllSepx);
 		}
-
 		RELEASEOBJECT(Text);
 		RELEASEOBJECT(m_PieceTable);
 
@@ -872,10 +887,11 @@ namespace DocFileFormat
 		RELEASEOBJECT(FootnoteDocumentFieldsPlex);
 		RELEASEOBJECT(EndnoteDocumentFieldsPlex);
 		RELEASEOBJECT(HeadersAndFootersDocumentFieldsPlex);
+		RELEASEOBJECT(AnnotationsFieldsPlex);
 		RELEASEOBJECT(HeaderStoriesPlex);
 		RELEASEOBJECT(IndividualCommentsPlex);
 		RELEASEOBJECT(AnnotationsReferencePlex);
-		RELEASEOBJECT(AnnotationsReferenceExPlex);
+		RELEASEOBJECT(AnnotationsReferencesEx);
 		RELEASEOBJECT(TextboxBreakPlex);
 		RELEASEOBJECT(TextboxBreakPlexHeader);
 		RELEASEOBJECT(OfficeDrawingPlex);

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -171,8 +171,15 @@ namespace DocFileFormat
 
 		std::map<int, int>						PictureBulletsCPsMap;
 
+		struct _annotStartEnd
+		{
+			int start;
+			int end;			
+			_UINT32 bookmarkId;
+		};
 		std::vector<std::pair<int, int>>		BookmarkStartEndCPs;
-		std::vector<std::pair<int, int>>		AnnotStartEndCPs;
+		std::vector<_annotStartEnd>				AnnotStartEndCPs;
+		std::map<int, int>						mapCommentsBookmarks;
 
 		FileInformationBlock				* FIB;
 		StyleSheet							* Styles;					// The style sheet of the document
@@ -211,7 +218,7 @@ namespace DocFileFormat
 		Plex<Spa>							*OfficeDrawingPlex;
 		Plex<Spa>							*OfficeDrawingPlexHeader;
 		
-		Plex<SectionDescriptor>				*SectionPlex;						// A Plex containing all section descriptors
+		Plex<SectionDescriptor>				*SectionPlex;	
 	
 		Plex<BookmarkFirst>					*BookmarkStartPlex;
 		Plex<EmptyStructure>				*BookmarkEndPlex;
@@ -224,10 +231,11 @@ namespace DocFileFormat
 		Plex<FieldCharacter>				*FootnoteDocumentFieldsPlex;
 		Plex<FieldCharacter>				*EndnoteDocumentFieldsPlex;
 		Plex<FieldCharacter>				*HeadersAndFootersDocumentFieldsPlex;
+		Plex<FieldCharacter>				*AnnotationsFieldsPlex;
 		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
+		
+		AnnotationReferenceExDescriptors	*AnnotationsReferencesEx;
 		
 	};
 }

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

@@ -32,7 +32,6 @@
 
 #include "WordprocessingDocument.h"
 
-#include "../../DesktopEditor/raster/BgraFrame.h"
 #include "../../DesktopEditor/common/Directory.h"
 #include "../../DesktopEditor/common/SystemUtils.h"
 
@@ -40,143 +39,10 @@
 #include "../../Common/DocxFormat/Source/DocxFormat/Core.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/ContentTypes.h"
 
-namespace ImageHelper
-{
-    struct __BITMAPINFOHEADER
-    {
-        _UINT32     biSize;
-        _INT32      biWidth;
-        _INT32      biHeight;
-        _UINT16     biPlanes;
-        _UINT16     biBitCount;
-        _UINT32     biCompression;
-        _UINT32     biSizeImage;
-        _INT32      biXPelsPerMeter;
-        _INT32      biYPelsPerMeter;
-        _UINT32     biClrUsed;
-        _UINT32     biClrImportant;
-    };
-
-    struct __BITMAPCOREHEADER
-    {
-        _UINT32     bcSize;                 /* used to get to color table */
-        _UINT16     bcWidth;
-        _UINT16     bcHeight;
-        _UINT16     bcPlanes;
-        _UINT16     bcBitCount;
-    };
-
-	inline Global::_BlipType SaveImageToFileFromDIB(unsigned char* data, int size, const std::wstring& file_name)//without ext
-	{
-		Global::_BlipType result = Global::msoblipERROR;
-
-		CBgraFrame oFrame;
-		int offset = 0, biSizeImage = 0;
-
-		__BITMAPINFOHEADER * header = (__BITMAPINFOHEADER*)data;
-		if (!header) return result;
-
-		result = Global::msoblipDIB;
-
-		if (header->biWidth > 100000 || header->biHeight > 100000 || header->biSize != 40)
-		{
-			__BITMAPCOREHEADER * header_core = (__BITMAPCOREHEADER *)data;
-			if (header_core->bcSize != 12)
-			{
-				result = Global::msoblipWMF;
-			}
-			else
-			{
-				offset = 12; //sizeof(BITMAPCOREHEADER)			
-			
-				oFrame.put_Height	(header_core->bcHeight );
-				oFrame.put_Width	(header_core->bcWidth );
-				
-				int sz_bitmap = header_core->bcHeight * header_core->bcWidth * header_core->bcBitCount/ 8;
-				
-				//if (header_core->bcWidth % 2 != 0 && sz_bitmap < size - offset)
-				//	header_core->bcWidth++;
-				///???? todooo непонятно .. в biff5 нужно флипать картинку, в biff8 не ясно ( - 
-				
-				int stride =  -(size - offset) / header_core->bcHeight;
-				oFrame.put_Stride	(stride/*header_core->bcBitCount * header_core->bcWidth /8 */);
-
-				biSizeImage = size - offset;
-				
-				if (-stride >= header_core->bcWidth && header_core->bcBitCount >=24 )
-				{
-					result = Global::msoblipPNG;
-				}
-			}
-		}
-		else
-		{
-			offset = 40; //sizeof(BITMAPINFOHEADER)
-
-			oFrame.put_Height	(header->biHeight );
-			oFrame.put_Width	(header->biWidth );
-			
-			int sz_bitmap = header->biHeight * header->biWidth * header->biBitCount/ 8;
-			
-			//if (header->biWidth % 2 != 0 && sz_bitmap < size -offset)
-			//	header->biWidth++;
-			
-			int stride = -(size - offset) / header->biHeight;
-
-			if (-stride >= header->biWidth && header->biBitCount >= 24)
-			{
-				result = Global::msoblipPNG;
-			}
-			oFrame.put_Stride	(stride/*header->biBitCount * header->biWidth /8*/);
-			
-			biSizeImage = header->biSizeImage > 0 ? header->biSizeImage : (size - offset);
-		}
-		
-//------------------------------------------------------------------------------------------
-
-		if (result == Global::msoblipPNG)
-		{
-			oFrame.put_Data((unsigned char*)data + offset);
-			
-            if (!oFrame.SaveFile(file_name + L".png", 4/*CXIMAGE_FORMAT_PNG*/))
-				result = Global::msoblipERROR;
-
-			oFrame.put_Data(NULL);
-		}
-		else if (result == Global::msoblipWMF)
-		{
-			NSFile::CFileBinary file;
-            if (file.CreateFileW(file_name + L".wmf"))
-			{
-				file.WriteFile((BYTE*)data, size);
-				file.CloseFile();
-			}
-		}
-		else if (biSizeImage > 0)
-		{
-			NSFile::CFileBinary file;
-            if (file.CreateFileW(file_name + L".bmp"))
-			{
-                _UINT16 vtType		= 0x4D42;				file.WriteFile((BYTE*)&vtType,	2);
-                _UINT32 dwLen		= biSizeImage;			file.WriteFile((BYTE*)&dwLen,	4);
-                _UINT32 dwRes		= 0;					file.WriteFile((BYTE*)&dwRes,	4);
-                _UINT32 dwOffset	= 2;					file.WriteFile((BYTE*)&dwOffset, 4);
-			
-				file.WriteFile((BYTE*)data, size);
-				file.CloseFile();
-			}
-		}
-		return result;
-	}
-}
-
 namespace DocFileFormat
 {
 	WordprocessingDocument::WordprocessingDocument(const std::wstring & _pathOutput, const WordDocument* _docFile) : 
-		OpenXmlPackage( _docFile ), 
-        FontTableXML( L"" ),	DocumentXML( L"" ),
-        StyleSheetXML( L"" ),	FootnotesXML ( L"" ),	NumberingXML( L"" ),
-        CommentsXML( L"" ),     SettingsXML( L"" ),     CommandTableXML ( L"" )
+		OpenXmlPackage( _docFile )
 	{
 		m_strOutputPath = _pathOutput;
 	}
@@ -262,6 +128,7 @@ namespace DocFileFormat
         SaveToFile(pathWord, std::wstring( L"endnotes.xml" ),		EndnotesXML );
         SaveToFile(pathWord, std::wstring( L"numbering.xml" ),      NumberingXML );
         SaveToFile(pathWord, std::wstring( L"comments.xml" ),		CommentsXML );
+		SaveToFile(pathWord, std::wstring( L"commentsExtended.xml"),CommentsExtendedXML );
         SaveToFile(pathWord, std::wstring( L"settings.xml" ),		SettingsXML );
         SaveToFile(pathWord, std::wstring( L"customizations.xml" ), CommandTableXML );
 
@@ -275,24 +142,7 @@ namespace DocFileFormat
 
 			for (std::list<ImageFileStructure>::iterator iter = ImagesList.begin(); iter != ImagesList.end(); ++iter)
 			{
-				unsigned char* bytes = NULL;
-				bytes = new unsigned char[iter->data.size()];
-				if (bytes) 
-				{
-					copy(iter->data.begin(), iter->data.end(), bytes);
-
-					if (Global::msoblipDIB == iter->blipType)
-					{//user_manual_v52.doc						
-                        std::wstring file_name = pathMedia + FILE_SEPARATOR_STR + L"image" + FormatUtils::IntToWideString(i++);
-						iter->blipType = ImageHelper::SaveImageToFileFromDIB(bytes, iter->data.size(), file_name);
-					}
-					else
-					{
-                        SaveToFile(pathMedia, std::wstring(L"image" ) + FormatUtils::IntToWideString(i++) + iter->ext, (void*)bytes, (unsigned int)iter->data.size());
-					}
-					
-					RELEASEARRAYOBJECTS(bytes);
-				}
+				SaveToFile(pathMedia, std::wstring(L"image" ) + FormatUtils::IntToWideString(i++) + iter->ext, (void*)iter->data.get(), iter->size);
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.h

@@ -65,6 +65,7 @@ namespace DocFileFormat
 		std::wstring EndnotesXML;
 		std::wstring NumberingXML;
 		std::wstring CommentsXML;
+		std::wstring CommentsExtendedXML;
 		std::wstring SettingsXML;
 		std::wstring CommandTableXML;
 

ASCOfficeDocFile/DocFormatLib/Mac/DocFormatLib.xcodeproj/project.pbxproj

@@ -29,9 +29,6 @@
 		6967B4D41E27C52700A129E2 /* ListTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4271E27C52700A129E2 /* ListTable.cpp */; };
 		6967B4D51E27C52700A129E2 /* MainDocumentMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4291E27C52700A129E2 /* MainDocumentMapping.cpp */; };
 		6967B4D61E27C52700A129E2 /* NumberingMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B42C1E27C52700A129E2 /* NumberingMapping.cpp */; };
-		6967B4D71E27C52700A129E2 /* Record.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4471E27C52700A129E2 /* Record.cpp */; };
-		6967B4D81E27C52700A129E2 /* RecordFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4491E27C52700A129E2 /* RecordFactory.cpp */; };
-		6967B4D91E27C52700A129E2 /* ShapeTypeFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4511E27C52700A129E2 /* ShapeTypeFactory.cpp */; };
 		6967B4DA1E27C52700A129E2 /* OleObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B47A1E27C52700A129E2 /* OleObject.cpp */; };
 		6967B4DB1E27C52700A129E2 /* OpenXmlPackage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B47D1E27C52700A129E2 /* OpenXmlPackage.cpp */; };
 		6967B4DC1E27C52700A129E2 /* ParagraphHeight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B47F1E27C52700A129E2 /* ParagraphHeight.cpp */; };
@@ -60,6 +57,9 @@
 		6967B4F31E27C52700A129E2 /* VMLShapeTypeMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4BC1E27C52700A129E2 /* VMLShapeTypeMapping.cpp */; };
 		6967B4F41E27C52700A129E2 /* WordDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4BF1E27C52700A129E2 /* WordDocument.cpp */; };
 		6967B4F51E27C52700A129E2 /* WordprocessingDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4C11E27C52700A129E2 /* WordprocessingDocument.cpp */; };
+		8A1BC15322DF34920084799E /* ShapeTypeFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A1BC11622DF34900084799E /* ShapeTypeFactory.cpp */; };
+		8A1BC15422DF34920084799E /* Record.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A1BC14922DF34920084799E /* Record.cpp */; };
+		8A1BC15522DF34920084799E /* RecordFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A1BC15222DF34920084799E /* RecordFactory.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -166,79 +166,6 @@
 		6967B42C1E27C52700A129E2 /* NumberingMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NumberingMapping.cpp; sourceTree = "<group>"; };
 		6967B42D1E27C52700A129E2 /* NumberingMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumberingMapping.h; sourceTree = "<group>"; };
 		6967B42E1E27C52700A129E2 /* OfficeArtContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfficeArtContent.h; sourceTree = "<group>"; };
-		6967B4301E27C52700A129E2 /* BitmapBlip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapBlip.h; sourceTree = "<group>"; };
-		6967B4311E27C52700A129E2 /* BlipStoreContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlipStoreContainer.h; sourceTree = "<group>"; };
-		6967B4321E27C52700A129E2 /* BlipStoreEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlipStoreEntry.h; sourceTree = "<group>"; };
-		6967B4331E27C52700A129E2 /* ChildAnchor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildAnchor.h; sourceTree = "<group>"; };
-		6967B4341E27C52700A129E2 /* ClientAnchor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientAnchor.h; sourceTree = "<group>"; };
-		6967B4351E27C52700A129E2 /* ClientData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientData.h; sourceTree = "<group>"; };
-		6967B4361E27C52700A129E2 /* DiagramBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagramBooleanProperties.h; sourceTree = "<group>"; };
-		6967B4371E27C52700A129E2 /* DrawingContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingContainer.h; sourceTree = "<group>"; };
-		6967B4381E27C52700A129E2 /* DrawingGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingGroup.h; sourceTree = "<group>"; };
-		6967B4391E27C52700A129E2 /* DrawingGroupRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingGroupRecord.h; sourceTree = "<group>"; };
-		6967B43A1E27C52700A129E2 /* DrawingRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingRecord.h; sourceTree = "<group>"; };
-		6967B43B1E27C52700A129E2 /* FillStyleBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FillStyleBooleanProperties.h; sourceTree = "<group>"; };
-		6967B43C1E27C52700A129E2 /* GeometryBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryBooleanProperties.h; sourceTree = "<group>"; };
-		6967B43D1E27C52700A129E2 /* GeometryTextBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryTextBooleanProperties.h; sourceTree = "<group>"; };
-		6967B43E1E27C52700A129E2 /* GroupContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupContainer.h; sourceTree = "<group>"; };
-		6967B43F1E27C52700A129E2 /* GroupShapeBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupShapeBooleanProperties.h; sourceTree = "<group>"; };
-		6967B4401E27C52700A129E2 /* GroupShapeRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupShapeRecord.h; sourceTree = "<group>"; };
-		6967B4411E27C52700A129E2 /* LineStyleBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineStyleBooleanProperties.h; sourceTree = "<group>"; };
-		6967B4421E27C52700A129E2 /* MetafilePictBlip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MetafilePictBlip.h; sourceTree = "<group>"; };
-		6967B4431E27C52700A129E2 /* OfficeArtClientTextbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfficeArtClientTextbox.h; sourceTree = "<group>"; };
-		6967B4441E27C52700A129E2 /* PathParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PathParser.h; sourceTree = "<group>"; };
-		6967B4451E27C52700A129E2 /* PathSegment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PathSegment.h; sourceTree = "<group>"; };
-		6967B4461E27C52700A129E2 /* ProtectionBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProtectionBooleanProperties.h; sourceTree = "<group>"; };
-		6967B4471E27C52700A129E2 /* Record.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Record.cpp; sourceTree = "<group>"; };
-		6967B4481E27C52700A129E2 /* Record.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Record.h; sourceTree = "<group>"; };
-		6967B4491E27C52700A129E2 /* RecordFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecordFactory.cpp; sourceTree = "<group>"; };
-		6967B44A1E27C52700A129E2 /* RecordFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordFactory.h; sourceTree = "<group>"; };
-		6967B44B1E27C52700A129E2 /* RegularContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegularContainer.h; sourceTree = "<group>"; };
-		6967B44C1E27C52700A129E2 /* ShadowStyleBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowStyleBooleanProperties.h; sourceTree = "<group>"; };
-		6967B44D1E27C52700A129E2 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shape.h; sourceTree = "<group>"; };
-		6967B44E1E27C52700A129E2 /* ShapeContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeContainer.h; sourceTree = "<group>"; };
-		6967B44F1E27C52700A129E2 /* ShapeOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeOptions.h; sourceTree = "<group>"; };
-		6967B4501E27C52700A129E2 /* ShapeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeType.h; sourceTree = "<group>"; };
-		6967B4511E27C52700A129E2 /* ShapeTypeFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeTypeFactory.cpp; sourceTree = "<group>"; };
-		6967B4521E27C52700A129E2 /* ShapeTypeFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeTypeFactory.h; sourceTree = "<group>"; };
-		6967B4541E27C52700A129E2 /* ArcType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArcType.h; sourceTree = "<group>"; };
-		6967B4551E27C52700A129E2 /* ArrowType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrowType.h; sourceTree = "<group>"; };
-		6967B4561E27C52700A129E2 /* BevelType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BevelType.h; sourceTree = "<group>"; };
-		6967B4571E27C52700A129E2 /* BlockArcType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockArcType.h; sourceTree = "<group>"; };
-		6967B4581E27C52700A129E2 /* BracketsType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BracketsType.h; sourceTree = "<group>"; };
-		6967B4591E27C52700A129E2 /* CalloutsType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CalloutsType.h; sourceTree = "<group>"; };
-		6967B45A1E27C52700A129E2 /* CanType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanType.h; sourceTree = "<group>"; };
-		6967B45B1E27C52700A129E2 /* Connector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Connector.h; sourceTree = "<group>"; };
-		6967B45C1E27C52700A129E2 /* CubeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CubeType.h; sourceTree = "<group>"; };
-		6967B45D1E27C52700A129E2 /* DiamondType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiamondType.h; sourceTree = "<group>"; };
-		6967B45E1E27C52700A129E2 /* DonutType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DonutType.h; sourceTree = "<group>"; };
-		6967B45F1E27C52700A129E2 /* FlowChartType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlowChartType.h; sourceTree = "<group>"; };
-		6967B4601E27C52700A129E2 /* FoldedCornerlType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FoldedCornerlType.h; sourceTree = "<group>"; };
-		6967B4611E27C52700A129E2 /* HeartType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeartType.h; sourceTree = "<group>"; };
-		6967B4621E27C52700A129E2 /* HexagonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HexagonType.h; sourceTree = "<group>"; };
-		6967B4631E27C52700A129E2 /* IsoscelesTriangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IsoscelesTriangleType.h; sourceTree = "<group>"; };
-		6967B4641E27C52700A129E2 /* LightningBoltType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LightningBoltType.h; sourceTree = "<group>"; };
-		6967B4651E27C52700A129E2 /* LineType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineType.h; sourceTree = "<group>"; };
-		6967B4661E27C52700A129E2 /* MoonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoonType.h; sourceTree = "<group>"; };
-		6967B4671E27C52700A129E2 /* NoSmokingType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoSmokingType.h; sourceTree = "<group>"; };
-		6967B4681E27C52700A129E2 /* OctagonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OctagonType.h; sourceTree = "<group>"; };
-		6967B4691E27C52700A129E2 /* OvalType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OvalType.h; sourceTree = "<group>"; };
-		6967B46A1E27C52700A129E2 /* ParallelogramType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParallelogramType.h; sourceTree = "<group>"; };
-		6967B46B1E27C52700A129E2 /* PentagonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PentagonType.h; sourceTree = "<group>"; };
-		6967B46C1E27C52700A129E2 /* PictureFrameType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureFrameType.h; sourceTree = "<group>"; };
-		6967B46D1E27C52700A129E2 /* PlaqueType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaqueType.h; sourceTree = "<group>"; };
-		6967B46E1E27C52700A129E2 /* PlusType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlusType.h; sourceTree = "<group>"; };
-		6967B46F1E27C52700A129E2 /* RectangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RectangleType.h; sourceTree = "<group>"; };
-		6967B4701E27C52700A129E2 /* RightTriangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RightTriangleType.h; sourceTree = "<group>"; };
-		6967B4711E27C52700A129E2 /* RoundedRectangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRectangleType.h; sourceTree = "<group>"; };
-		6967B4721E27C52700A129E2 /* SmileyFaceType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmileyFaceType.h; sourceTree = "<group>"; };
-		6967B4731E27C52700A129E2 /* StarType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StarType.h; sourceTree = "<group>"; };
-		6967B4741E27C52700A129E2 /* SunType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SunType.h; sourceTree = "<group>"; };
-		6967B4751E27C52700A129E2 /* TextboxType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextboxType.h; sourceTree = "<group>"; };
-		6967B4761E27C52700A129E2 /* TrapezoidType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrapezoidType.h; sourceTree = "<group>"; };
-		6967B4771E27C52700A129E2 /* WordArtText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WordArtText.h; sourceTree = "<group>"; };
-		6967B4781E27C52700A129E2 /* SplitMenuColorContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SplitMenuColorContainer.h; sourceTree = "<group>"; };
-		6967B4791E27C52700A129E2 /* UnknownRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnknownRecord.h; sourceTree = "<group>"; };
 		6967B47A1E27C52700A129E2 /* OleObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OleObject.cpp; sourceTree = "<group>"; };
 		6967B47B1E27C52700A129E2 /* OleObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OleObject.h; sourceTree = "<group>"; };
 		6967B47C1E27C52700A129E2 /* OleObjectMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OleObjectMapping.h; sourceTree = "<group>"; };
@@ -312,6 +239,71 @@
 		6967B4C01E27C52700A129E2 /* WordDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WordDocument.h; sourceTree = "<group>"; };
 		6967B4C11E27C52700A129E2 /* WordprocessingDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WordprocessingDocument.cpp; sourceTree = "<group>"; };
 		6967B4C21E27C52700A129E2 /* WordprocessingDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WordprocessingDocument.h; sourceTree = "<group>"; };
+		8A1BC11122DF348F0084799E /* ClientAnchor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientAnchor.h; sourceTree = "<group>"; };
+		8A1BC11222DF34900084799E /* ShapeTypeFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeTypeFactory.h; sourceTree = "<group>"; };
+		8A1BC11322DF34900084799E /* OfficeArtClientTextbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfficeArtClientTextbox.h; sourceTree = "<group>"; };
+		8A1BC11422DF34900084799E /* DiagramBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagramBooleanProperties.h; sourceTree = "<group>"; };
+		8A1BC11522DF34900084799E /* MetafilePictBlip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MetafilePictBlip.h; sourceTree = "<group>"; };
+		8A1BC11622DF34900084799E /* ShapeTypeFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeTypeFactory.cpp; sourceTree = "<group>"; };
+		8A1BC11722DF34900084799E /* DrawingContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingContainer.h; sourceTree = "<group>"; };
+		8A1BC11822DF34900084799E /* UnknownRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnknownRecord.h; sourceTree = "<group>"; };
+		8A1BC11922DF34900084799E /* Record.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Record.h; sourceTree = "<group>"; };
+		8A1BC11A22DF34900084799E /* BitmapBlip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapBlip.h; sourceTree = "<group>"; };
+		8A1BC11B22DF34910084799E /* OfficeArtFRITContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfficeArtFRITContainer.h; sourceTree = "<group>"; };
+		8A1BC11C22DF34910084799E /* DrawingGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingGroup.h; sourceTree = "<group>"; };
+		8A1BC11D22DF34910084799E /* ShapeContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeContainer.h; sourceTree = "<group>"; };
+		8A1BC11E22DF34910084799E /* ShapeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeType.h; sourceTree = "<group>"; };
+		8A1BC12022DF34910084799E /* PlaqueType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaqueType.h; sourceTree = "<group>"; };
+		8A1BC12122DF34910084799E /* CubeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CubeType.h; sourceTree = "<group>"; };
+		8A1BC12222DF34910084799E /* LightningBoltType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LightningBoltType.h; sourceTree = "<group>"; };
+		8A1BC12322DF34910084799E /* OvalType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OvalType.h; sourceTree = "<group>"; };
+		8A1BC12422DF34910084799E /* CalloutsType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CalloutsType.h; sourceTree = "<group>"; };
+		8A1BC12522DF34910084799E /* TextboxType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextboxType.h; sourceTree = "<group>"; };
+		8A1BC12622DF34910084799E /* HexagonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HexagonType.h; sourceTree = "<group>"; };
+		8A1BC12722DF34910084799E /* NoSmokingType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoSmokingType.h; sourceTree = "<group>"; };
+		8A1BC12822DF34910084799E /* OctagonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OctagonType.h; sourceTree = "<group>"; };
+		8A1BC12922DF34910084799E /* ArcType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArcType.h; sourceTree = "<group>"; };
+		8A1BC12A22DF34910084799E /* CanType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanType.h; sourceTree = "<group>"; };
+		8A1BC12B22DF34910084799E /* PictureFrameType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureFrameType.h; sourceTree = "<group>"; };
+		8A1BC12C22DF34910084799E /* BevelType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BevelType.h; sourceTree = "<group>"; };
+		8A1BC12D22DF34910084799E /* MoonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoonType.h; sourceTree = "<group>"; };
+		8A1BC12E22DF34910084799E /* FoldedCornerlType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FoldedCornerlType.h; sourceTree = "<group>"; };
+		8A1BC12F22DF34910084799E /* PentagonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PentagonType.h; sourceTree = "<group>"; };
+		8A1BC13022DF34910084799E /* BracketsType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BracketsType.h; sourceTree = "<group>"; };
+		8A1BC13122DF34910084799E /* IsoscelesTriangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IsoscelesTriangleType.h; sourceTree = "<group>"; };
+		8A1BC13222DF34910084799E /* StarType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StarType.h; sourceTree = "<group>"; };
+		8A1BC13322DF34910084799E /* DonutType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DonutType.h; sourceTree = "<group>"; };
+		8A1BC13422DF34910084799E /* RectangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RectangleType.h; sourceTree = "<group>"; };
+		8A1BC13522DF34910084799E /* TrapezoidType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrapezoidType.h; sourceTree = "<group>"; };
+		8A1BC13622DF34910084799E /* ArrowType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrowType.h; sourceTree = "<group>"; };
+		8A1BC13722DF34910084799E /* SmileyFaceType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmileyFaceType.h; sourceTree = "<group>"; };
+		8A1BC13822DF34910084799E /* PlusType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlusType.h; sourceTree = "<group>"; };
+		8A1BC13922DF34910084799E /* RightTriangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RightTriangleType.h; sourceTree = "<group>"; };
+		8A1BC13A22DF34910084799E /* HeartType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeartType.h; sourceTree = "<group>"; };
+		8A1BC13B22DF34910084799E /* SunType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SunType.h; sourceTree = "<group>"; };
+		8A1BC13C22DF34910084799E /* Connector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Connector.h; sourceTree = "<group>"; };
+		8A1BC13D22DF34910084799E /* RoundedRectangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRectangleType.h; sourceTree = "<group>"; };
+		8A1BC13E22DF34910084799E /* BlockArcType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockArcType.h; sourceTree = "<group>"; };
+		8A1BC13F22DF34910084799E /* WordArtText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WordArtText.h; sourceTree = "<group>"; };
+		8A1BC14022DF34910084799E /* FlowChartType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlowChartType.h; sourceTree = "<group>"; };
+		8A1BC14122DF34910084799E /* LineType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineType.h; sourceTree = "<group>"; };
+		8A1BC14222DF34910084799E /* DiamondType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiamondType.h; sourceTree = "<group>"; };
+		8A1BC14322DF34910084799E /* ParallelogramType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParallelogramType.h; sourceTree = "<group>"; };
+		8A1BC14422DF34910084799E /* ClientData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientData.h; sourceTree = "<group>"; };
+		8A1BC14522DF34910084799E /* GroupShapeRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupShapeRecord.h; sourceTree = "<group>"; };
+		8A1BC14622DF34910084799E /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shape.h; sourceTree = "<group>"; };
+		8A1BC14722DF34910084799E /* BlipStoreEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlipStoreEntry.h; sourceTree = "<group>"; };
+		8A1BC14822DF34920084799E /* DrawingGroupRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingGroupRecord.h; sourceTree = "<group>"; };
+		8A1BC14922DF34920084799E /* Record.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Record.cpp; sourceTree = "<group>"; };
+		8A1BC14A22DF34920084799E /* SplitMenuColorContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SplitMenuColorContainer.h; sourceTree = "<group>"; };
+		8A1BC14B22DF34920084799E /* ShapeOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeOptions.h; sourceTree = "<group>"; };
+		8A1BC14C22DF34920084799E /* RegularContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegularContainer.h; sourceTree = "<group>"; };
+		8A1BC14D22DF34920084799E /* BlipStoreContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlipStoreContainer.h; sourceTree = "<group>"; };
+		8A1BC14E22DF34920084799E /* RecordFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordFactory.h; sourceTree = "<group>"; };
+		8A1BC14F22DF34920084799E /* DrawingRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingRecord.h; sourceTree = "<group>"; };
+		8A1BC15022DF34920084799E /* GroupContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupContainer.h; sourceTree = "<group>"; };
+		8A1BC15122DF34920084799E /* ChildAnchor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildAnchor.h; sourceTree = "<group>"; };
+		8A1BC15222DF34920084799E /* RecordFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecordFactory.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -541,87 +533,79 @@
 		6967B42F1E27C52700A129E2 /* OfficeDrawing */ = {
 			isa = PBXGroup;
 			children = (
-				6967B4301E27C52700A129E2 /* BitmapBlip.h */,
-				6967B4311E27C52700A129E2 /* BlipStoreContainer.h */,
-				6967B4321E27C52700A129E2 /* BlipStoreEntry.h */,
-				6967B4331E27C52700A129E2 /* ChildAnchor.h */,
-				6967B4341E27C52700A129E2 /* ClientAnchor.h */,
-				6967B4351E27C52700A129E2 /* ClientData.h */,
-				6967B4361E27C52700A129E2 /* DiagramBooleanProperties.h */,
-				6967B4371E27C52700A129E2 /* DrawingContainer.h */,
-				6967B4381E27C52700A129E2 /* DrawingGroup.h */,
-				6967B4391E27C52700A129E2 /* DrawingGroupRecord.h */,
-				6967B43A1E27C52700A129E2 /* DrawingRecord.h */,
-				6967B43B1E27C52700A129E2 /* FillStyleBooleanProperties.h */,
-				6967B43C1E27C52700A129E2 /* GeometryBooleanProperties.h */,
-				6967B43D1E27C52700A129E2 /* GeometryTextBooleanProperties.h */,
-				6967B43E1E27C52700A129E2 /* GroupContainer.h */,
-				6967B43F1E27C52700A129E2 /* GroupShapeBooleanProperties.h */,
-				6967B4401E27C52700A129E2 /* GroupShapeRecord.h */,
-				6967B4411E27C52700A129E2 /* LineStyleBooleanProperties.h */,
-				6967B4421E27C52700A129E2 /* MetafilePictBlip.h */,
-				6967B4431E27C52700A129E2 /* OfficeArtClientTextbox.h */,
-				6967B4441E27C52700A129E2 /* PathParser.h */,
-				6967B4451E27C52700A129E2 /* PathSegment.h */,
-				6967B4461E27C52700A129E2 /* ProtectionBooleanProperties.h */,
-				6967B4471E27C52700A129E2 /* Record.cpp */,
-				6967B4481E27C52700A129E2 /* Record.h */,
-				6967B4491E27C52700A129E2 /* RecordFactory.cpp */,
-				6967B44A1E27C52700A129E2 /* RecordFactory.h */,
-				6967B44B1E27C52700A129E2 /* RegularContainer.h */,
-				6967B44C1E27C52700A129E2 /* ShadowStyleBooleanProperties.h */,
-				6967B44D1E27C52700A129E2 /* Shape.h */,
-				6967B44E1E27C52700A129E2 /* ShapeContainer.h */,
-				6967B44F1E27C52700A129E2 /* ShapeOptions.h */,
-				6967B4501E27C52700A129E2 /* ShapeType.h */,
-				6967B4511E27C52700A129E2 /* ShapeTypeFactory.cpp */,
-				6967B4521E27C52700A129E2 /* ShapeTypeFactory.h */,
-				6967B4531E27C52700A129E2 /* Shapetypes */,
-				6967B4781E27C52700A129E2 /* SplitMenuColorContainer.h */,
-				6967B4791E27C52700A129E2 /* UnknownRecord.h */,
+				8A1BC11A22DF34900084799E /* BitmapBlip.h */,
+				8A1BC14D22DF34920084799E /* BlipStoreContainer.h */,
+				8A1BC14722DF34910084799E /* BlipStoreEntry.h */,
+				8A1BC15122DF34920084799E /* ChildAnchor.h */,
+				8A1BC11122DF348F0084799E /* ClientAnchor.h */,
+				8A1BC14422DF34910084799E /* ClientData.h */,
+				8A1BC11422DF34900084799E /* DiagramBooleanProperties.h */,
+				8A1BC11722DF34900084799E /* DrawingContainer.h */,
+				8A1BC11C22DF34910084799E /* DrawingGroup.h */,
+				8A1BC14822DF34920084799E /* DrawingGroupRecord.h */,
+				8A1BC14F22DF34920084799E /* DrawingRecord.h */,
+				8A1BC15022DF34920084799E /* GroupContainer.h */,
+				8A1BC14522DF34910084799E /* GroupShapeRecord.h */,
+				8A1BC11522DF34900084799E /* MetafilePictBlip.h */,
+				8A1BC11322DF34900084799E /* OfficeArtClientTextbox.h */,
+				8A1BC11B22DF34910084799E /* OfficeArtFRITContainer.h */,
+				8A1BC14922DF34920084799E /* Record.cpp */,
+				8A1BC11922DF34900084799E /* Record.h */,
+				8A1BC15222DF34920084799E /* RecordFactory.cpp */,
+				8A1BC14E22DF34920084799E /* RecordFactory.h */,
+				8A1BC14C22DF34920084799E /* RegularContainer.h */,
+				8A1BC14622DF34910084799E /* Shape.h */,
+				8A1BC11D22DF34910084799E /* ShapeContainer.h */,
+				8A1BC14B22DF34920084799E /* ShapeOptions.h */,
+				8A1BC11E22DF34910084799E /* ShapeType.h */,
+				8A1BC11622DF34900084799E /* ShapeTypeFactory.cpp */,
+				8A1BC11222DF34900084799E /* ShapeTypeFactory.h */,
+				8A1BC11F22DF34910084799E /* Shapetypes */,
+				8A1BC14A22DF34920084799E /* SplitMenuColorContainer.h */,
+				8A1BC11822DF34900084799E /* UnknownRecord.h */,
 			);
 			path = OfficeDrawing;
 			sourceTree = "<group>";
 		};
-		6967B4531E27C52700A129E2 /* Shapetypes */ = {
+		8A1BC11F22DF34910084799E /* Shapetypes */ = {
 			isa = PBXGroup;
 			children = (
-				6967B4541E27C52700A129E2 /* ArcType.h */,
-				6967B4551E27C52700A129E2 /* ArrowType.h */,
-				6967B4561E27C52700A129E2 /* BevelType.h */,
-				6967B4571E27C52700A129E2 /* BlockArcType.h */,
-				6967B4581E27C52700A129E2 /* BracketsType.h */,
-				6967B4591E27C52700A129E2 /* CalloutsType.h */,
-				6967B45A1E27C52700A129E2 /* CanType.h */,
-				6967B45B1E27C52700A129E2 /* Connector.h */,
-				6967B45C1E27C52700A129E2 /* CubeType.h */,
-				6967B45D1E27C52700A129E2 /* DiamondType.h */,
-				6967B45E1E27C52700A129E2 /* DonutType.h */,
-				6967B45F1E27C52700A129E2 /* FlowChartType.h */,
-				6967B4601E27C52700A129E2 /* FoldedCornerlType.h */,
-				6967B4611E27C52700A129E2 /* HeartType.h */,
-				6967B4621E27C52700A129E2 /* HexagonType.h */,
-				6967B4631E27C52700A129E2 /* IsoscelesTriangleType.h */,
-				6967B4641E27C52700A129E2 /* LightningBoltType.h */,
-				6967B4651E27C52700A129E2 /* LineType.h */,
-				6967B4661E27C52700A129E2 /* MoonType.h */,
-				6967B4671E27C52700A129E2 /* NoSmokingType.h */,
-				6967B4681E27C52700A129E2 /* OctagonType.h */,
-				6967B4691E27C52700A129E2 /* OvalType.h */,
-				6967B46A1E27C52700A129E2 /* ParallelogramType.h */,
-				6967B46B1E27C52700A129E2 /* PentagonType.h */,
-				6967B46C1E27C52700A129E2 /* PictureFrameType.h */,
-				6967B46D1E27C52700A129E2 /* PlaqueType.h */,
-				6967B46E1E27C52700A129E2 /* PlusType.h */,
-				6967B46F1E27C52700A129E2 /* RectangleType.h */,
-				6967B4701E27C52700A129E2 /* RightTriangleType.h */,
-				6967B4711E27C52700A129E2 /* RoundedRectangleType.h */,
-				6967B4721E27C52700A129E2 /* SmileyFaceType.h */,
-				6967B4731E27C52700A129E2 /* StarType.h */,
-				6967B4741E27C52700A129E2 /* SunType.h */,
-				6967B4751E27C52700A129E2 /* TextboxType.h */,
-				6967B4761E27C52700A129E2 /* TrapezoidType.h */,
-				6967B4771E27C52700A129E2 /* WordArtText.h */,
+				8A1BC12022DF34910084799E /* PlaqueType.h */,
+				8A1BC12122DF34910084799E /* CubeType.h */,
+				8A1BC12222DF34910084799E /* LightningBoltType.h */,
+				8A1BC12322DF34910084799E /* OvalType.h */,
+				8A1BC12422DF34910084799E /* CalloutsType.h */,
+				8A1BC12522DF34910084799E /* TextboxType.h */,
+				8A1BC12622DF34910084799E /* HexagonType.h */,
+				8A1BC12722DF34910084799E /* NoSmokingType.h */,
+				8A1BC12822DF34910084799E /* OctagonType.h */,
+				8A1BC12922DF34910084799E /* ArcType.h */,
+				8A1BC12A22DF34910084799E /* CanType.h */,
+				8A1BC12B22DF34910084799E /* PictureFrameType.h */,
+				8A1BC12C22DF34910084799E /* BevelType.h */,
+				8A1BC12D22DF34910084799E /* MoonType.h */,
+				8A1BC12E22DF34910084799E /* FoldedCornerlType.h */,
+				8A1BC12F22DF34910084799E /* PentagonType.h */,
+				8A1BC13022DF34910084799E /* BracketsType.h */,
+				8A1BC13122DF34910084799E /* IsoscelesTriangleType.h */,
+				8A1BC13222DF34910084799E /* StarType.h */,
+				8A1BC13322DF34910084799E /* DonutType.h */,
+				8A1BC13422DF34910084799E /* RectangleType.h */,
+				8A1BC13522DF34910084799E /* TrapezoidType.h */,
+				8A1BC13622DF34910084799E /* ArrowType.h */,
+				8A1BC13722DF34910084799E /* SmileyFaceType.h */,
+				8A1BC13822DF34910084799E /* PlusType.h */,
+				8A1BC13922DF34910084799E /* RightTriangleType.h */,
+				8A1BC13A22DF34910084799E /* HeartType.h */,
+				8A1BC13B22DF34910084799E /* SunType.h */,
+				8A1BC13C22DF34910084799E /* Connector.h */,
+				8A1BC13D22DF34910084799E /* RoundedRectangleType.h */,
+				8A1BC13E22DF34910084799E /* BlockArcType.h */,
+				8A1BC13F22DF34910084799E /* WordArtText.h */,
+				8A1BC14022DF34910084799E /* FlowChartType.h */,
+				8A1BC14122DF34910084799E /* LineType.h */,
+				8A1BC14222DF34910084799E /* DiamondType.h */,
+				8A1BC14322DF34910084799E /* ParallelogramType.h */,
 			);
 			path = Shapetypes;
 			sourceTree = "<group>";
@@ -667,6 +651,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 6967B2E21E27C23A00A129E2;
@@ -687,7 +672,6 @@
 				6967B4D11E27C52700A129E2 /* LanguageIdMapping.cpp in Sources */,
 				6967B4E61E27C52700A129E2 /* SinglePropertyModifier.cpp in Sources */,
 				6967B4C91E27C52700A129E2 /* EncryptionHeader.cpp in Sources */,
-				6967B4D71E27C52700A129E2 /* Record.cpp in Sources */,
 				6967B4ED1E27C52700A129E2 /* TableMapping.cpp in Sources */,
 				6967B4F31E27C52700A129E2 /* VMLShapeTypeMapping.cpp in Sources */,
 				6967B4E31E27C52700A129E2 /* RevisionData.cpp in Sources */,
@@ -699,18 +683,18 @@
 				6967B4E21E27C52700A129E2 /* PropertyExceptions.cpp in Sources */,
 				6967B4C31E27C52700A129E2 /* AnnotationReferenceDescriptor.cpp in Sources */,
 				6967B4D31E27C52700A129E2 /* ListLevel.cpp in Sources */,
+				8A1BC15322DF34920084799E /* ShapeTypeFactory.cpp in Sources */,
 				6967B4CB1E27C52700A129E2 /* FontTableMapping.cpp in Sources */,
 				6967B4EC1E27C52700A129E2 /* TableCellPropertiesMapping.cpp in Sources */,
-				6967B4D81E27C52700A129E2 /* RecordFactory.cpp in Sources */,
 				6967B4C61E27C52700A129E2 /* DocumentMapping.cpp in Sources */,
 				6967B4CA1E27C52700A129E2 /* FontFamilyName.cpp in Sources */,
 				6967B4F21E27C52700A129E2 /* VMLShapeMapping.cpp in Sources */,
 				6967B4C71E27C52700A129E2 /* DocumentProperties.cpp in Sources */,
 				6967B4EF1E27C52700A129E2 /* TableRowPropertiesMapping.cpp in Sources */,
+				8A1BC15422DF34920084799E /* Record.cpp in Sources */,
 				6967B4E01E27C52700A129E2 /* PieceTable.cpp in Sources */,
 				6967B4E81E27C52700A129E2 /* StyleSheet.cpp in Sources */,
 				6967B4EA1E27C52700A129E2 /* StyleSheetInformation.cpp in Sources */,
-				6967B4D91E27C52700A129E2 /* ShapeTypeFactory.cpp in Sources */,
 				6967B4D01E27C52700A129E2 /* HeaderMapping.cpp in Sources */,
 				6967B4DA1E27C52700A129E2 /* OleObject.cpp in Sources */,
 				6967B4D61E27C52700A129E2 /* NumberingMapping.cpp in Sources */,
@@ -724,6 +708,7 @@
 				6967B4C51E27C52700A129E2 /* Converter.cpp in Sources */,
 				6967B4E91E27C52700A129E2 /* StyleSheetDescription.cpp in Sources */,
 				6967B4E41E27C52700A129E2 /* SectionPropertiesMapping.cpp in Sources */,
+				8A1BC15522DF34920084799E /* RecordFactory.cpp in Sources */,
 				6967B4EE1E27C52700A129E2 /* TablePropertiesMapping.cpp in Sources */,
 				6967B4D51E27C52700A129E2 /* MainDocumentMapping.cpp in Sources */,
 				6967B4E51E27C52700A129E2 /* SettingsMapping.cpp in Sources */,
@@ -835,16 +820,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEVELOPMENT_TEAM = 2WH24U26GJ;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					UNICODE,
-					_UNICODE,
-					_USE_XMLLITE_READER_,
-					USE_LITE_READER,
-					USE_ATL_CSTRING,
-					_USE_LIBXML2_READER_,
-					LIBXML_READER_ENABLED,
-					_IOS,
-				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -866,16 +841,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEVELOPMENT_TEAM = 2WH24U26GJ;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					UNICODE,
-					_UNICODE,
-					_USE_XMLLITE_READER_,
-					USE_LITE_READER,
-					USE_ATL_CSTRING,
-					_USE_LIBXML2_READER_,
-					LIBXML_READER_ENABLED,
-					_IOS,
-				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,

ASCOfficeDocFile/DocFormatTest/DocFile_VS2005.sln

@@ -2,20 +2,17 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatLib", "..\DocFormatLib\Win32\DocFormatLib.vcproj", "{C5371405-338F-4B70-83BD-2A5CDF64F383}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
-		{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsFormat", "..\..\ASCOfficeXlsFile2\source\win32\XlsFormat.vcproj", "{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatTest", "DocFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
 	ProjectSection(ProjectDependencies) = postProject
+		{C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
+		{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
 		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
 		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
 		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
-		{C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"

ASCOfficeDocFile/DocFormatTest/DocFormatTest.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_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS;DONT_USED_EXTRA_LIBRARY"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -345,6 +345,14 @@
 				RelativePath="..\..\DesktopEditor\common\Base64.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Writer\BinaryReader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Reader\BinaryWriter.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\BinWriter\BinWriters.cpp"
 				>

ASCOfficeDocxFile2/BinReader/CommentsWriter.h

@@ -33,6 +33,7 @@
 #define COMMENTS_WRITER
 
 #include "../../XlsxSerializerCom/Common/Common.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/FileTypes.h"
 
 namespace Writers
 {
@@ -40,6 +41,8 @@ namespace Writers
     static std::wstring g_string_comment_End = _T("</w:comments>");
     static std::wstring g_string_commentExt_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w15:commentsEx 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_commentExt_End = _T("</w15:commentsEx>");
+	static std::wstring g_string_commentsIds_Start = _T("<w16cid:commentsIds mc:Ignorable=\"w16cid\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\">");
+	static std::wstring g_string_commentsIds_End = _T("</w16cid:commentsIds>");
     static std::wstring g_string_people_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w15:people 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_people_End = _T("</w15:people>");
 
@@ -49,22 +52,33 @@ namespace Writers
 	public:
         std::wstring	m_sComment;
         std::wstring	m_sCommentExt;
+		std::wstring	m_sCommentsIds;
         std::wstring	m_sPeople;
+		std::wstring	m_sDocumentComment;
+		std::wstring	m_sDocumentCommentExt;
+		std::wstring	m_sDocumentCommentsIds;
+		std::wstring	m_sDocumentPeople;
 
 		CommentsWriter(std::wstring sDir) : m_sDir(sDir)
 		{
 		}
-        void setElements(std::wstring& sComment, std::wstring& sCommentExt, std::wstring& sPeople)
+		void setElements(std::wstring& sComment, std::wstring& sCommentExt, std::wstring& sCommentsIds, std::wstring& sPeople, std::wstring& sDocumentComment, std::wstring& sDocumentCommentExt, std::wstring& sDocumentCommentsIds, std::wstring& sDocumentPeople)
 		{
 			m_sComment		= sComment;
 			m_sCommentExt	= sCommentExt;
+			m_sCommentsIds	= sCommentsIds;
 			m_sPeople		= sPeople;
+			m_sDocumentComment		= sDocumentComment;
+			m_sDocumentCommentExt	= sDocumentCommentExt;
+			m_sDocumentCommentsIds	= sDocumentCommentsIds;
+			m_sDocumentPeople		= sDocumentPeople;
 		}
 		void Write()
 		{
+			std::wstring sDir = m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR;
             if(false == m_sComment.empty())
 			{
-                OOX::CPath filePath = m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("comments.xml");
+				OOX::CPath filePath = sDir + OOX::FileTypes::Comments.DefaultFileName().GetPath();
 
 				NSFile::CFileBinary oFile;
 				oFile.CreateFileW(filePath.GetPath());
@@ -76,21 +90,70 @@ namespace Writers
             if(false == m_sCommentExt.empty())
 			{
 				NSFile::CFileBinary oFile;
-                oFile.CreateFileW(m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("commentsExtended.xml"));
+				oFile.CreateFileW(sDir + OOX::FileTypes::CommentsExt.DefaultFileName().GetPath());
 				oFile.WriteStringUTF8(g_string_commentExt_Start);
 				oFile.WriteStringUTF8(m_sCommentExt);
 				oFile.WriteStringUTF8(g_string_commentExt_End);
 				oFile.CloseFile();
 			}
+			if(false == m_sCommentsIds.empty())
+			{
+				NSFile::CFileBinary oFile;
+				oFile.CreateFileW(sDir + OOX::FileTypes::CommentsIds.DefaultFileName().GetPath());
+				oFile.WriteStringUTF8(g_string_commentsIds_Start);
+				oFile.WriteStringUTF8(m_sCommentsIds);
+				oFile.WriteStringUTF8(g_string_commentsIds_End);
+				oFile.CloseFile();
+			}
             if(false == m_sPeople.empty())
 			{
 				NSFile::CFileBinary oFile;
-                oFile.CreateFileW(m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("people.xml"));
+				oFile.CreateFileW(sDir + OOX::FileTypes::People.DefaultFileName().GetPath());
 				oFile.WriteStringUTF8(g_string_people_Start);
 				oFile.WriteStringUTF8(m_sPeople);
 				oFile.WriteStringUTF8(g_string_people_End);
 				oFile.CloseFile();
 			}
+
+			if(false == m_sDocumentComment.empty())
+			{
+				OOX::CPath filePath = sDir + OOX::FileTypes::DocumentComments.DefaultFileName().GetPath();
+
+				NSFile::CFileBinary oFile;
+				oFile.CreateFileW(filePath.GetPath());
+					oFile.WriteStringUTF8(g_string_comment_Start);
+					oFile.WriteStringUTF8(m_sDocumentComment);
+					oFile.WriteStringUTF8(g_string_comment_End);
+				oFile.CloseFile();
+			}
+			if(false == m_sDocumentCommentExt.empty())
+			{
+				NSFile::CFileBinary oFile;
+				oFile.CreateFileW(sDir + OOX::FileTypes::DocumentCommentsExt.DefaultFileName().GetPath());
+				oFile.WriteStringUTF8(g_string_commentExt_Start);
+				oFile.WriteStringUTF8(m_sDocumentCommentExt);
+				oFile.WriteStringUTF8(g_string_commentExt_End);
+				oFile.CloseFile();
+			}
+			if(false == m_sDocumentCommentsIds.empty())
+			{
+				NSFile::CFileBinary oFile;
+				oFile.CreateFileW(sDir + OOX::FileTypes::DocumentCommentsIds.DefaultFileName().GetPath());
+				oFile.WriteStringUTF8(g_string_commentsIds_Start);
+				oFile.WriteStringUTF8(m_sDocumentCommentsIds);
+				oFile.WriteStringUTF8(g_string_commentsIds_End);
+				oFile.CloseFile();
+			}
+			if(false == m_sDocumentPeople.empty())
+			{
+				NSFile::CFileBinary oFile;
+				oFile.CreateFileW(sDir + OOX::FileTypes::DocumentPeople.DefaultFileName().GetPath());
+				oFile.WriteStringUTF8(g_string_people_Start);
+				oFile.WriteStringUTF8(m_sDocumentPeople);
+				oFile.WriteStringUTF8(g_string_people_End);
+				oFile.CloseFile();
+			}
+
 		}
 	};
 }

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -29,6 +29,8 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
+#pragma once
+
 #ifndef READER_CLASSES
 #define READER_CLASSES
 
@@ -60,6 +62,8 @@ public:
     std::wstring pgBorders;
     std::wstring footnotePr;
     std::wstring endnotePr;
+	bool RtlGutter;
+	long Gutter;
 
 	bool bW;
 	bool bH;
@@ -74,6 +78,8 @@ public:
 	bool bEvenAndOddHeaders;
 	bool bSectionType;
 	bool bPageNumStart;
+	bool bRtlGutter;
+	bool bGutter;
 	SectPr()
 	{
 		sHeaderFooterReference = _T("");
@@ -92,6 +98,7 @@ public:
 		bEvenAndOddHeaders = false;
 		bSectionType = false;
 		bPageNumStart = false;
+		bRtlGutter = false;
 	}
     std::wstring Write()
 	{
@@ -150,7 +157,9 @@ public:
 				sRes += L" w:header=\"" + std::to_wstring(Header) + L"\"";
 			if(bFooter)
 				sRes += L" w:footer=\"" + std::to_wstring(Footer) + L"\"";
-			sRes += L" w:gutter=\"0\"/>";
+			if(bGutter)
+				sRes += L" w:gutter=\"" + std::to_wstring(Gutter) + L"\"";
+			sRes += L"/>";
 		}
         if(!pgBorders.empty())
             sRes += pgBorders;
@@ -158,6 +167,14 @@ public:
         if(bPageNumStart)
             sRes += L"<w:pgNumType w:start=\"" + std::to_wstring(PageNumStart) + L"\"/>";
 
+		if(bRtlGutter)
+		{
+			if(RtlGutter)
+				sRes += L"<w:rtlGutter/>";
+			else
+				sRes += L"<w:rtlGutter w:val=\"0\"/>";
+		}
+
         if(!cols.empty())
             sRes += cols;
         sRes += L"<w:docGrid w:linePitch=\"360\"/>";
@@ -1479,14 +1496,25 @@ public:
             std::wstring sFormat;
 			switch(Format)
 			{
-			case numbering_numfmt_None:sFormat = _T("none");break;
-			case numbering_numfmt_Bullet:sFormat = _T("bullet");break;
-			case numbering_numfmt_Decimal:sFormat = _T("decimal");break;
-			case numbering_numfmt_LowerRoman:sFormat = _T("lowerRoman");break;
-			case numbering_numfmt_UpperRoman:sFormat = _T("upperRoman");break;
-			case numbering_numfmt_LowerLetter:sFormat = _T("lowerLetter");break;
-			case numbering_numfmt_UpperLetter:sFormat = _T("upperLetter");break;
-			case numbering_numfmt_DecimalZero:sFormat = _T("decimalZero");break;
+			case numbering_numfmt_None:			sFormat = L"none";			break;
+			case numbering_numfmt_Bullet:		sFormat = L"bullet";		break;
+			case numbering_numfmt_Decimal:		sFormat = L"decimal";		break;
+			case numbering_numfmt_LowerRoman:	sFormat = L"lowerRoman";	break;
+			case numbering_numfmt_UpperRoman:	sFormat = L"upperRoman";	break;
+			case numbering_numfmt_LowerLetter:	sFormat = L"lowerLetter";	break;
+			case numbering_numfmt_UpperLetter:	sFormat = L"upperLetter";	break;
+			case numbering_numfmt_DecimalZero:	sFormat = L"decimalZero";	break;
+			default:
+			{
+				Format -= 0x2008;
+				if (Format >= 0)
+				{
+					SimpleTypes::CNumberFormat<> numFormat;
+					numFormat.SetValue((SimpleTypes::ENumberFormat)Format);
+
+					sFormat = numFormat.ToString();
+				}
+			}break;
 			}
             if(!sFormat.empty())
 			{
@@ -1874,10 +1902,13 @@ public:
 	int IdOpen;
 	int IdFormat;
     std::wstring UserName;
+	std::wstring Initials;
     std::wstring UserId;
+	std::wstring ProviderId;
     std::wstring Date;
 	std::wstring OOData;
 	bool Solved;
+	unsigned int DurableId;
     std::wstring Text;
     std::wstring m_sParaId;
     std::wstring m_sParaIdParent;
@@ -1886,12 +1917,14 @@ public:
 	bool bIdOpen;
 	bool bIdFormat;
 	bool bSolved;
+	bool bDurableId;
 public:
 	CComment(IdCounter& oParaIdCounter, IdCounter& oFormatIdCounter):m_oParaIdCounter(oParaIdCounter),m_oFormatIdCounter(oFormatIdCounter)
 	{
 		bIdOpen = false;
 		bIdFormat = false;
 		bSolved = false;
+		bDurableId = false;
 	}
 	~CComment()
 	{
@@ -1928,15 +1961,6 @@ public:
 		}
 		return sRes;
 	}
-	std::wstring writeTemplates(bool isExt)
-	{
-        std::wstring sRes;
-		sRes += isExt ? writeContentExt(this) : writeContent(this);
-		
-		for(size_t i = 0; i < replies.size(); ++i)
-			sRes += isExt ? writeContentExt(replies[i]) : writeContent(replies[i]);
-		return sRes;
-	}
     static std::wstring writeRef(CComment* pComment, const std::wstring& sBefore, const std::wstring& sRef, const std::wstring& sAfter)
 	{
         std::wstring sRes;
@@ -1950,7 +1974,7 @@ public:
         sRes += (sAfter);
 		return sRes;
 	}
-    static bool writeContentWritePart(CComment* pComment, std::wstring& sText, int nPrevIndex, int nCurIndex, bool bFirst, std::wstring& sRes)
+	static void writeContentWritePart(CComment* pComment, std::wstring& sText, int nPrevIndex, int nCurIndex, std::wstring& sRes)
 	{
         std::wstring sPart;
 		if(nPrevIndex < nCurIndex)
@@ -1958,17 +1982,11 @@ public:
 
         int nId = pComment->m_oParaIdCounter.getNextId();
 
-        std::wstring sId = XmlUtils::IntToString(nId, L"%08X");
-		if(bFirst)
-		{
-			bFirst = false;
-			pComment->m_sParaId = sId;
-		}
-        sRes += L"<w:p w14:paraId=\"" + sId + L"\" w14:textId=\"" + sId + L"\">";
+		pComment->m_sParaId = XmlUtils::IntToString(nId, L"%08X");
+		sRes += L"<w:p w14:paraId=\"" + pComment->m_sParaId + L"\" w14:textId=\"" + pComment->m_sParaId + L"\">";
         sRes += L"<w:pPr><w:spacing w:line=\"240\" w:after=\"0\" w:lineRule=\"auto\" w:before=\"0\"/><w:ind w:firstLine=\"0\" w:left=\"0\" w:right=\"0\"/><w:jc w:val=\"left\"/></w:pPr><w:r><w:rPr><w:rFonts w:eastAsia=\"Arial\" w:ascii=\"Arial\" w:hAnsi=\"Arial\" w:cs=\"Arial\"/><w:sz w:val=\"22\"/></w:rPr><w:t xml:space=\"preserve\">";
         sRes += sPart;
         sRes += L"</w:t></w:r></w:p>";
-		return bFirst;
 	}
     static std::wstring writeContent(CComment* pComment)
 	{
@@ -1979,22 +1997,12 @@ public:
 			pComment->IdFormat = pComment->m_oFormatIdCounter.getNextId();
 		}
         sRes += L"<w:comment w:id=\"" + std::to_wstring(pComment->IdFormat) + L"\"";
-        std::wstring sInitials;
         if(false == pComment->UserName.empty())
 		{
             std::wstring sUserName = XmlUtils::EncodeXmlString(pComment->UserName);
             sRes += L" w:author=\"";
             sRes += (sUserName);
-            sRes += L"\"";
-    //делаем initials
-            std::vector<std::wstring> arSplit;
-            boost::algorithm::split(arSplit, pComment->UserName, boost::algorithm::is_any_of(L" "), boost::algorithm::token_compress_on);
-
-            for (size_t i = 0; i < arSplit.size(); i++)
-            {
-                sInitials += arSplit[i][0];
-            }
-
+			sRes += L"\"";
 		}
         if(false == pComment->Date.empty())
 		{
@@ -2010,11 +2018,10 @@ public:
 			sRes += sData;
 			sRes += L"\"";
 		}
-        if(false == sInitials.empty())
+		if(false == pComment->Initials.empty())
 		{
-			sInitials = XmlUtils::EncodeXmlString(sInitials);
             sRes += L" w:initials=\"";
-            sRes += sInitials;
+			sRes += XmlUtils::EncodeXmlString(pComment->Initials);
             sRes += L"\"";
 		}
         sRes += L">";
@@ -2022,18 +2029,17 @@ public:
 
 		XmlUtils::replace_all(sText, L"\r", L"");
 
-		bool bFirst = true;
 		int nPrevIndex = 0;
 		for (int i = 0; i < (int)sText.length(); i++)
 		{
 			wchar_t cToken = sText[i];
 			if('\n' == cToken)
 			{
-				bFirst = writeContentWritePart(pComment, sText, nPrevIndex, i, bFirst, sRes);
+				writeContentWritePart(pComment, sText, nPrevIndex, i, sRes);
 				nPrevIndex = i + 1;
 			}
 		}
-		writeContentWritePart(pComment, sText, nPrevIndex, (int)sText.length(), bFirst, sRes);
+		writeContentWritePart(pComment, sText, nPrevIndex, (int)sText.length(), sRes);
         sRes += L"</w:comment>";
 		return sRes;
 	}
@@ -2056,18 +2062,32 @@ w15:paraIdParent=\"" + pComment->m_sParaIdParent + L"\" w15:done=\"" + sDone + L
 		}
 		return sRes;
 	}
+	static std::wstring writeContentsIds(CComment* pComment)
+	{
+		std::wstring sRes;
+		if(!pComment->m_sParaId.empty() && pComment->bDurableId)
+		{
+			sRes += L"<w16cid:commentId w16cid:paraId=\"" + pComment->m_sParaId + L"\" w16cid:durableId=\"" + XmlUtils::IntToString(pComment->DurableId, L"%08X") + L"\"/>";
+		}
+		return sRes;
+	}
     static std::wstring writePeople(CComment* pComment)
 	{
         std::wstring sRes;
-        if(false == pComment->UserName.empty() && false == pComment->UserId.empty())
+		if(false == pComment->UserName.empty())
 		{
-            std::wstring sUserName = XmlUtils::EncodeXmlString(pComment->UserName);
-            std::wstring sUserId = XmlUtils::EncodeXmlString(pComment->UserId);
             sRes += L"<w15:person w15:author=\"";
-            sRes += sUserName;
-            sRes += L"\"><w15:presenceInfo w15:providerId=\"Teamlab\" w15:userId=\"";
-            sRes += sUserId;
-            sRes += L"\"/></w15:person>";
+			sRes += XmlUtils::EncodeXmlString(pComment->UserName);
+			sRes += L"\">";
+			if(!pComment->ProviderId.empty() && !pComment->UserId.empty())
+			{
+				sRes += L"<w15:presenceInfo w15:providerId=\"";
+				sRes += XmlUtils::EncodeXmlString(pComment->ProviderId);
+				sRes += L"\" w15:userId=\"";
+				sRes += XmlUtils::EncodeXmlString(pComment->UserId);
+				sRes += L"\"/>";
+			}
+			sRes += L"</w15:person>";
 		}
 		return sRes;
 	}
@@ -2123,7 +2143,9 @@ public:
         std::wstring sRes;
         for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
-			sRes += it->second->writeTemplates(false);
+			sRes += CComment::writeContent(it->second);
+			for(size_t i = 0; i < it->second->replies.size(); ++i)
+				sRes += CComment::writeContent(it->second->replies[i]);
 		}
 		return sRes;
 	}
@@ -2132,7 +2154,20 @@ public:
         std::wstring sRes;
         for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
-			sRes += it->second->writeTemplates(true);
+			sRes += CComment::writeContentExt(it->second);
+			for(size_t i = 0; i < it->second->replies.size(); ++i)
+				sRes += CComment::writeContentExt(it->second->replies[i]);
+		}
+		return sRes;
+	}
+	std::wstring writeContentsIds()
+	{
+		std::wstring sRes;
+		for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
+		{
+			sRes += CComment::writeContentsIds(it->second);
+			for(size_t i = 0; i < it->second->replies.size(); ++i)
+				sRes += CComment::writeContentsIds(it->second->replies[i]);
 		}
 		return sRes;
 	}

ASCOfficeDocxFile2/BinReader/SettingWriter.h

@@ -37,14 +37,14 @@
 namespace Writers
 {
     static std::wstring g_string_set_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?><w:settings xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:v=\"urn:schemas-microsoft-com:vml\">");
-    static std::wstring g_string_set_Default = _T("<w:zoom w:percent=\"100\"/><w:characterSpacingControl w:val=\"doNotCompress\"/><w:compat><w:compatSetting w:name=\"compatibilityMode\" w:uri=\"http://schemas.microsoft.com/office/word\" w:val=\"15\"/><w:compatSetting w:name=\"overrideTableStyleFontSizeAndJustification\" w:uri=\"http://schemas.microsoft.com/office/word\" w:val=\"1\"/><w:compatSetting w:name=\"enableOpenTypeFeatures\" w:uri=\"http://schemas.microsoft.com/office/word\" w:val=\"1\"/><w:compatSetting w:name=\"doNotFlipMirrorIndents\" w:uri=\"http://schemas.microsoft.com/office/word\" w:val=\"1\"/></w:compat><w:themeFontLang w:val=\"en-US\" w:eastAsia=\"zh-CN\"/><w:shapeDefaults><o:shapedefaults v:ext=\"edit\" spidmax=\"1026\"/><o:shapelayout v:ext=\"edit\"><o:idmap v:ext=\"edit\" data=\"1\"/></o:shapelayout></w:shapeDefaults><w:decimalSymbol w:val=\".\"/><w:listSeparator w:val=\",\"/>");
+	static std::wstring g_string_set_Default = _T("<w:zoom w:percent=\"100\"/><w:characterSpacingControl w:val=\"doNotCompress\"/><w:themeFontLang w:val=\"en-US\" w:eastAsia=\"zh-CN\"/><w:shapeDefaults><o:shapedefaults v:ext=\"edit\" spidmax=\"1026\"/><o:shapelayout v:ext=\"edit\"><o:idmap v:ext=\"edit\" data=\"1\"/></o:shapelayout></w:shapeDefaults>");
     static std::wstring g_string_set_End = _T("</w:settings>");
 
 	class SettingWriter
 	{
-        std::wstring				m_sDir;
-		NSStringUtils::CStringBuilder		m_oSettingWriter;
-		HeaderFooterWriter&			m_oHeaderFooterWriter;
+        std::wstring					m_sDir;
+		NSStringUtils::CStringBuilder	m_oSettingWriter;
+		HeaderFooterWriter&				m_oHeaderFooterWriter;
 	public:
         SettingWriter(std::wstring sDir, HeaderFooterWriter& oHeaderFooterWriter):m_sDir(sDir),m_oHeaderFooterWriter(oHeaderFooterWriter)
 		{

ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h

@@ -34,8 +34,9 @@
 
 #include "BinReaderWriterDefines.h"
 
-#include "../../Common/DocxFormat/Source/Common/SimpleTypes_OMath.h"
 #include "../../Common/DocxFormat/Source/MathEquation/OutputDev.h"
+#include "../../Common/DocxFormat/Source/Common/SimpleTypes_OMath.h"
+#include "../../Common/DocxFormat/Source/Common/SimpleTypes_Shared.h"
 #include <stack>
 
 namespace MathEquation

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -146,7 +146,8 @@ extern int g_nCurFormatVersion;
 		Background	= 12,
 		VbaProject	= 13,
 		App			= 15,
-		Core		= 16
+		Core		= 16,
+		DocumentComments	= 17
 	};}
 	namespace c_oSerSigTypes{enum c_oSerSigTypes
 	{
@@ -466,7 +467,8 @@ extern int g_nCurFormatVersion;
 		cols = 8,
 		pgBorders = 9,
 		footnotePr = 10,
-		endnotePr = 11
+		endnotePr = 11,
+		rtlGutter = 12
 	};}
 	namespace c_oSerProp_secPrSettingsType{enum c_oSerProp_secPrSettingsType
 	{
@@ -505,7 +507,8 @@ extern int g_nCurFormatVersion;
 		JsaProject = 22,
 		BookmarkStart = 23,
 		BookmarkEnd = 24,
-		MRun = 25
+		MRun = 25,
+		AltChunk = 26
 	};}
 	namespace c_oSerDocTableType{enum c_oSerDocTableType
 	{
@@ -523,7 +526,11 @@ extern int g_nCurFormatVersion;
 		Sdt = 10,
 		BookmarkStart = 11,
 		BookmarkEnd = 12,
-		tblGrid_ItemTwips = 13
+		tblGrid_ItemTwips = 13,
+		MoveFromRangeStart = 14,
+		MoveFromRangeEnd = 15,
+		MoveToRangeStart = 16,
+		MoveToRangeEnd = 17
 	};}
 	namespace c_oSerRunType{enum c_oSerRunType
 	{
@@ -777,7 +784,8 @@ extern int g_nCurFormatVersion;
 		RightTwips = 8,
 		BottomTwips = 9,
 		HeaderTwips = 10,
-		FooterTwips = 11
+		FooterTwips = 11,
+		GutterTwips = 12
 	};}
 	namespace c_oSer_ColorType{enum c_oSer_ColorType
 	{
@@ -796,7 +804,9 @@ extern int g_nCurFormatVersion;
 		QuoteText = 7,
 		Solved = 8,
 		Replies = 9,
-		OOData = 10
+		OOData = 10,
+		DurableId = 11,
+		ProviderId = 12
 	};}
 	namespace c_oSer_SettingsType{enum c_oSer_SettingsType
 	{
@@ -809,7 +819,15 @@ extern int g_nCurFormatVersion;
 		SdtGlobalColor = 6,
 		SdtGlobalShowHighlight = 7,
 		Compat = 8,
-		DefaultTabStopTwips = 9
+		DefaultTabStopTwips = 9,
+		DecimalSymbol = 10,
+		ListSeparator = 11,
+		GutterAtTop = 12,
+		MirrorMargins = 13,
+		PrintTwoOnOne = 14,
+		BookFoldPrinting = 15,
+		BookFoldPrintingSheets = 16,
+		BookFoldRevPrinting = 17
 	};}
 	namespace c_oSer_MathPrType{enum c_oSer_SettingsType
 	{
@@ -976,7 +994,11 @@ extern int g_nCurFormatVersion;
 		columnbreak = 64,
 		ARPr = 65,
 		BookmarkStart = 66,
-		BookmarkEnd = 67
+		BookmarkEnd = 67,
+		MoveFromRangeStart = 68,
+		MoveFromRangeEnd = 69,
+		MoveToRangeStart = 70,
+		MoveToRangeEnd = 71
 	};}
 	namespace c_oSer_FramePrType{ enum c_oSer_FramePrType
 	{		
@@ -1201,7 +1223,10 @@ extern int g_nCurFormatVersion;
 		CompatSetting = 0,
 		CompatName = 1,
 		CompatUri = 2,
-		CompatValue = 3
+		CompatValue = 3,
+		Flags1 = 4,
+		Flags2 = 5,
+		Flags3 = 6
 	};}
 }
 

ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp

@@ -187,7 +187,7 @@ namespace BinXlsxRW{
 		{
 			OOX::Spreadsheet::CText* pText = new OOX::Spreadsheet::CText();
 			pText->m_sText = aSharedStrings[i];
-			if(std::wstring::npos == pText->m_sText.find(_T(" ")))
+			if(std::wstring::npos != pText->m_sText.find(_T(" ")))
 			{
 				pText->m_oSpace.Init();
 				pText->m_oSpace->SetValue(SimpleTypes::xmlspacePreserve);
@@ -277,13 +277,20 @@ namespace BinXlsxRW{
 			pTable->m_oTable->m_oTableStyleInfo->m_oShowColumnStripes.Init();
 			pTable->m_oTable->m_oTableStyleInfo->m_oShowColumnStripes->FromBool(false);
 			pTable->m_oTable->m_oTableColumns.Init();
+			
 			for(size_t i = 0; i < m_aTableNames.size(); ++i)
 			{
 				OOX::Spreadsheet::CTableColumn* pTableColumn = new OOX::Spreadsheet::CTableColumn();
-				pTableColumn->m_oId.Init();
-				pTableColumn->m_oId->SetValue((unsigned int)i + 1);
-				pTableColumn->m_oName.Init();
-				pTableColumn->m_oName->append(m_aTableNames[i]);
+
+				if (!pTableColumn->m_oId.IsInit())
+				{
+					pTableColumn->m_oId.Init();
+					pTableColumn->m_oId->SetValue((unsigned int)i + 1);
+				}
+				if (!pTableColumn->m_oName.IsInit())
+				{
+					pTableColumn->m_oName = m_aTableNames[i];
+				}
 				pTable->m_oTable->m_oTableColumns->m_arrItems.push_back(pTableColumn);
 			}
 			pTable->m_oTable->m_oTableColumns->m_oCount.Init();

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -30,15 +30,20 @@
  *
  */
 #include "DocxSerializer.h"
+ 
+#include "../BinWriter/BinWriters.h"
+#include "../BinReader/Readers.h"
+
+#include "../../ASCOfficePPTXFile/ASCOfficeDrawingConverter.h"
+#include "../../ASCOfficePPTXFile/Editor/FontPicker.h"
+
+#include "FontProcessor.h"
+#include "../../OfficeUtils/src/OfficeUtils.h"
 
 #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"
-#include "../../OfficeUtils/src/OfficeUtils.h"
 
 #include "../../Common/DocxFormat/Source/DocxFormat/App.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/Core.h"

ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro

@@ -32,6 +32,8 @@ SOURCES += \
     ../../XlsxSerializerCom/Reader/ChartFromToBinary.cpp \
     ../../XlsxSerializerCom/Reader/CommonWriter.cpp \
     ../../XlsxSerializerCom/Reader/CSVReader.cpp \
+    ../../XlsxSerializerCom/Reader/BinaryWriter.cpp \
+    ../../XlsxSerializerCom/Writer/BinaryReader.cpp \
     ../../XlsxSerializerCom/Writer/CSVWriter.cpp \
     ../../OfficeCryptReader/source/ECMACryptFile.cpp \
     ../../OfficeCryptReader/source/CryptTransform.cpp \

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj

@@ -55,6 +55,8 @@
 		8A404FD5208A01CE00F2D5CF /* FileDownloader_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A404FD4208A01CE00F2D5CF /* FileDownloader_private.h */; };
 		8AB24BFD213004E400E80DDD /* CustormXmlWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AB24BFB213004E300E80DDD /* CustormXmlWriter.cpp */; };
 		8AB24BFE213004E400E80DDD /* CustormXmlWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AB24BFC213004E300E80DDD /* CustormXmlWriter.h */; };
+		8AE10E6E222824F400A542DE /* BinaryWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AE10E6D222824F400A542DE /* BinaryWriter.cpp */; };
+		8AE10E702228251000A542DE /* BinaryReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AE10E6F2228251000A542DE /* BinaryReader.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -107,6 +109,8 @@
 		8A404FD4208A01CE00F2D5CF /* FileDownloader_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownloader_private.h; path = ../../../Common/FileDownloader/FileDownloader_private.h; sourceTree = "<group>"; };
 		8AB24BFB213004E300E80DDD /* CustormXmlWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustormXmlWriter.cpp; sourceTree = "<group>"; };
 		8AB24BFC213004E300E80DDD /* CustormXmlWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustormXmlWriter.h; sourceTree = "<group>"; };
+		8AE10E6D222824F400A542DE /* BinaryWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BinaryWriter.cpp; sourceTree = "<group>"; };
+		8AE10E6F2228251000A542DE /* BinaryReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BinaryReader.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -215,6 +219,7 @@
 			isa = PBXGroup;
 			children = (
 				17E17F211AC4549B00BEA2EA /* BinaryWriter.h */,
+				8AE10E6D222824F400A542DE /* BinaryWriter.cpp */,
 				17E17F221AC4549B00BEA2EA /* ChartFromToBinary.cpp */,
 				17E17F231AC4549B00BEA2EA /* ChartFromToBinary.h */,
 				17E17F241AC4549B00BEA2EA /* CommonWriter.cpp */,
@@ -230,6 +235,7 @@
 			children = (
 				17E17F2D1AC4549B00BEA2EA /* BinaryCommonReader.h */,
 				17E17F2E1AC4549B00BEA2EA /* BinaryReader.h */,
+				8AE10E6F2228251000A542DE /* BinaryReader.cpp */,
 				17E17F2F1AC4549B00BEA2EA /* CSVWriter.cpp */,
 				17E17F301AC4549B00BEA2EA /* CSVWriter.h */,
 			);
@@ -336,6 +342,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 17E17ED31AC453F800BEA2EA;
@@ -362,11 +369,13 @@
 				17C1FE9B1ACC42C4006B99B3 /* CSVWriter.cpp in Sources */,
 				69414A301CB51666003E771B /* ChartWriter.cpp in Sources */,
 				6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */,
+				8AE10E702228251000A542DE /* BinaryReader.cpp in Sources */,
 				69BBDF251F0B8AAC00EB1BF7 /* FileDownloader_mac.mm in Sources */,
 				17C1FE9C1ACC42C4006B99B3 /* XlsxSerializer.cpp in Sources */,
 				690FE0851E9BBD68004B26D0 /* Readers.cpp in Sources */,
 				17C1FE9D1ACC42C4006B99B3 /* FontProcessor.cpp in Sources */,
 				8A404FD3208A01AF00F2D5CF /* FileDownloader.cpp in Sources */,
+				8AE10E6E222824F400A542DE /* BinaryWriter.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -376,7 +385,7 @@
 		17C1FEC01ACC42C4006B99B3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				EXECUTABLE_PREFIX = lib;
 				GCC_ENABLE_CPP_EXCEPTIONS = YES;
 				GCC_ENABLE_CPP_RTTI = YES;
@@ -408,7 +417,7 @@
 		17C1FEC11ACC42C4006B99B3 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				EXECUTABLE_PREFIX = lib;
 				GCC_ENABLE_CPP_EXCEPTIONS = YES;
 				GCC_ENABLE_CPP_RTTI = YES;

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/xcshareddata/xcschemes/ASCOfficeDocxFile2Lib.xcscheme

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "17C1FE921ACC42C4006B99B3"
+               BuildableName = "libASCOfficeDocxFile2Lib_ios.a"
+               BlueprintName = "ASCOfficeDocxFile2Lib"
+               ReferencedContainer = "container:ASCOfficeDocxFile2Lib.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "17C1FE921ACC42C4006B99B3"
+            BuildableName = "libASCOfficeDocxFile2Lib_ios.a"
+            BlueprintName = "ASCOfficeDocxFile2Lib"
+            ReferencedContainer = "container:ASCOfficeDocxFile2Lib.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "17C1FE921ACC42C4006B99B3"
+            BuildableName = "libASCOfficeDocxFile2Lib_ios.a"
+            BlueprintName = "ASCOfficeDocxFile2Lib"
+            ReferencedContainer = "container:ASCOfficeDocxFile2Lib.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes/ASCOfficeDocxFile2Lib.xcscheme

@@ -14,8 +14,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "17E17EDB1AC453F800BEA2EA"
-               BuildableName = "libASCOfficeDocxFile2Lib.a"
+               BlueprintIdentifier = "17C1FE921ACC42C4006B99B3"
+               BuildableName = "libASCOfficeDocxFile2Lib_ios.a"
                BlueprintName = "ASCOfficeDocxFile2Lib"
                ReferencedContainer = "container:ASCOfficeDocxFile2Lib.xcodeproj">
             </BuildableReference>
@@ -23,27 +23,30 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "17E17EDB1AC453F800BEA2EA"
-            BuildableName = "libASCOfficeDocxFile2Lib.a"
+            BlueprintIdentifier = "17C1FE921ACC42C4006B99B3"
+            BuildableName = "libASCOfficeDocxFile2Lib_ios.a"
             BlueprintName = "ASCOfficeDocxFile2Lib"
             ReferencedContainer = "container:ASCOfficeDocxFile2Lib.xcodeproj">
          </BuildableReference>
@@ -52,16 +55,16 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "17E17EDB1AC453F800BEA2EA"
-            BuildableName = "libASCOfficeDocxFile2Lib.a"
+            BlueprintIdentifier = "17C1FE921ACC42C4006B99B3"
+            BuildableName = "libASCOfficeDocxFile2Lib_ios.a"
             BlueprintName = "ASCOfficeDocxFile2Lib"
             ReferencedContainer = "container:ASCOfficeDocxFile2Lib.xcodeproj">
          </BuildableReference>

ASCOfficeOdfFile/formulasconvert/formulasconvert.h

@@ -92,8 +92,9 @@ public:
 	std::wstring convert_conditional_formula(std::wstring const & expr);
   
     // Лист1!$A$1 -> $Лист1.$A$1 
-    std::wstring convert_named_ref	(std::wstring const & expr);
+    std::wstring convert_named_ref(std::wstring const & expr);
 	std::wstring convert_named_formula(std::wstring const & expr);
+	bool is_simple_ref(std::wstring const & expr);
 
 	std::wstring get_table_name();
 

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -122,27 +122,64 @@ namespace formulasconvert {
 			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"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"\"");
+			//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"ТОС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"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");
+		//	//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");
+
+			std::wstring result;
+
+			size_t pos = 0, size = expr.length();
+
+			while(pos < size)
+			{
+				switch(expr[pos])
+				{
+					case '.':
+					{	
+						result += L"ТОСHKA";
+					}break;
+					case '!':
+					{
+						result += L"VOSKL";
+					}break;
+					case '(':
+					{
+						result += L"SCOBCAIN";
+					}break;
+					case ')':
+					{
+						result += L"SCOBCAOUT";
+					}break;
+					case ' ':
+					{
+						result += L"PROBEL";
+					}break;
+					default:
+					{
+						result += expr[pos];
+					}break;
+				}
+				pos++;
+			}
+		expr = result;
 		}
 		static std::wstring convert_scobci(boost::wsmatch const & what)
 		{
@@ -210,25 +247,41 @@ namespace formulasconvert {
 
 	bool odf2oox_converter::Impl::find_first_last_ref(std::wstring const & expr, std::wstring & table,std::wstring & ref_first,std::wstring & ref_last)
 	{	
+		std::wstring workstr = expr;
+		workstr = boost::regex_replace(
+			workstr,
+			boost::wregex(L"('.*?')|(\".*?\")"),
+			&convert_scobci, boost::match_default | boost::format_all);
+
 		std::vector< std::wstring > splitted;
 	    
-		boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L".:"), boost::algorithm::token_compress_on);
-	    
+		boost::algorithm::split(splitted, workstr, boost::algorithm::is_any_of(L".:"), boost::algorithm::token_compress_on);
+	  
+		bool res = false;
+		if (splitted.size() == 2)
+		{
+			table		= splitted[0];	
+			ref_first	= splitted[1];
+			ref_last	= splitted[1];
+			res = true;
+		}
 		if (splitted.size() == 3)
 		{
 			table		= splitted[0];	
 			ref_first	= splitted[1];
 			ref_last	= splitted[2];
-			return true;
+			res = true;
 		}
 		if (splitted.size() == 4)
 		{
 			table		= splitted[0];	
 			ref_first	= splitted[1];
 			ref_last	= splitted[3];
-			return true;
+			res = true;
 		}
-		return false;
+		replace_tmp_back( table );
+
+		return res;
 	}
 
 	bool odf2oox_converter::Impl::find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref)

ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp

@@ -133,34 +133,202 @@ public:
 	}
 	static void oox_replace_tmp_back(std::wstring &expr)
 	{
-		XmlUtils::replace_all( expr, L"ТОСHKA", L".");
-		XmlUtils::replace_all( expr, L"VOSKL", L"!");
+		std::wstring result;
 
-		XmlUtils::replace_all( expr, L"SCOBCAIN", L"(");
-		XmlUtils::replace_all( expr, L"SCOBCAOUT", L")");
+		size_t pos = 0, size = expr.length();
 
-		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"\"");
+		while(pos < size)
+		{
+			if (pos + 5 >= size)
+			{
+				result += expr[pos++];
+				continue;
+			}
+			switch(expr[pos])
+			{
+				case 'M':
+				{
+					if ((pos + 5 < size) && (expr.substr(pos, 5) == L"MINYS"))
+					{
+						result += L"-"; pos += 5;
+					}
+					else
+					{
+						result += expr[pos++];
+					}
+				}break;
+				case 'T':
+				{	
+					if ((pos + 6 < size) && (expr.substr(pos, 6) == L"ТОСHKA"))
+					{
+						result += L"."; pos += 6;
+					}
+					else
+					{
+						result += expr[pos++];
+					}
+				}break;
+				case 'V':
+				{
+					if ((pos + 5 < size) && (expr.substr(pos, 5) == L"VOSKL"))
+					{
+						result += L"!"; pos += 5;
+					}
+					else
+					{
+						result += expr[pos++];
+					}
+				}break;
+				case 'S':
+				{
+					if ((pos + 8 < size) && (expr.substr(pos, 8) == L"SCOBCAIN"))
+					{
+						result += L"("; pos += 8;
+					}
+					else if ((pos + 9 < size) && (expr.substr(pos, 9) == L"SCOBCAOUT"))
+					{
+						result += L")"; pos += 9;
+					}
+					else
+					{
+						result += expr[pos++];
+					}
+				}break;
+				case 'K':
+				{
+					if ((pos + 9 < size) && (expr.substr(pos, 9) == L"KVADRATIN"))
+					{
+						result += L"["; pos += 9;
+					}
+					else if ((pos + 10 < size) && (expr.substr(pos, 10) == L"KVADRATOUT"))
+					{
+						result += L"]"; pos += 10;
+					}
+					else if ((pos + 8 < size) && (expr.substr(pos, 8) == L"KAVYCHKA"))
+					{
+						result += L"\""; pos += 8;
+					}
+					else
+					{
+						result += expr[pos++];
+					}
+				}break;
+				case 'P':
+				{
+					if ((pos + 6 < size) && (expr.substr(pos, 6) == L"PROBEL"))
+					{
+						result += L" "; pos += 6;
+					}
+					else
+					{
+						result += expr[pos++];
+					}
+				}break;
+				case 'A':
+				{
+					if ((pos + 8 < size) && (expr.substr(pos, 8) == L"APOSTROF"))
+					{
+						result += L"'"; pos += 8;
+					}
+					else
+					{
+						result += expr[pos++];
+					}
+				}break;
+				default:
+				{
+					result += expr[pos++];
+				}break;
+			}
+		}
+		expr = result;
+		//XmlUtils::replace_all( expr, L"MINYS", L"-");
+		//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");
+		std::wstring result;
 
-		XmlUtils::replace_all( expr, L"(", L"SCOBCAIN");
-		XmlUtils::replace_all( expr, L")", L"SCOBCAOUT");
+		size_t pos = 0, size = expr.length();
 
-		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");
+		while(pos < size)
+		{
+			switch(expr[pos])
+			{
+				case '-':
+				{
+					result += L"MINYS";
+				}break;
+				case '.':
+				{	
+					result += L"ТОСHKA";
+				}break;
+				case '!':
+				{
+					result += L"VOSKL";
+				}break;
+				case '(':
+				{
+					result += L"SCOBCAIN";
+				}break;
+				case ')':
+				{
+					result += L"SCOBCAOUT";
+				}break;
+				case '[':
+				{
+					result += L"KVADRATIN";
+				}break;
+				case ']':
+				{
+					result += L"KVADRATOUT";
+				}break;
+				case ' ':
+				{
+					result += L"PROBEL";
+				}break;
+				case '\'':
+				{
+					result += L"APOSTROF";
+				}break;
+				case '\"':
+				{
+					result += L"KAVYCHKA";
+				}break;
+				default:
+				{
+					result += expr[pos];
+				}break;
+			}
+			pos++;
+		}
+		expr = result;
+
+		//XmlUtils::replace_all( expr, L"-", L"MINYS");
+		//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)
@@ -174,6 +342,7 @@ public:
 	}
 	void replace_named_ref(std::wstring & expr);
     void replace_named_formula(std::wstring & expr);
+	bool is_simple_ref(std::wstring const & expr);
 	
 	static bool isFindBaseCell_;
 
@@ -188,14 +357,14 @@ void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr, bool bSele
 	if ((0 == expr.find(L"KAVYCHKA")) && (expr.length() - 8 == expr.rfind(L"KAVYCHKA") ))
 		return;
 
-	boost::wregex re(L"([:$!])+");
+	boost::wregex re(L"(([:$!])+)|(\\S+\\d+)");
 
 	boost::wsmatch result;
 	bool b = boost::regex_search(expr, result, re);
 
 	if (b)
 	{
-		boost::wregex re1(L"(\\$?[^\']+\\!)?([\\w^0-9$]*\\d*)\\:?([\\w^0-9$]*\\d*)?");
+		boost::wregex re1(L"(\\$?[^\\']+\\!)?([a-zA-Z$]+\\d*)(\\:[a-zA-Z$]+\\d*)?");
 //                          $   Sheet2   ! $ A1                 :  $ B5    
 //                          $   Sheet2   ! $ A                  :  $ A    
 //                          $   Sheet2   ! $ 1                  :  $ 1    
@@ -216,6 +385,78 @@ void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr, bool bSele
 
 	return;
 }
+
+size_t getColAddressInv(const std::wstring & a_)
+{
+    std::wstring a = a_;
+    ::boost::algorithm::to_upper(a);
+    static const size_t r = (L'Z' - L'A' + 1);
+    size_t mul = 1;
+    bool f = true;
+    size_t res = 0;
+
+	for (int i = a.length() - 1; i >= 0; i--)
+    {
+        size_t v = a[i] - L'A';
+        if (f)
+            f = false;
+        else
+            v += 1;
+        res += v * mul;
+        mul *= r;
+    }
+    return res;
+}
+
+size_t getRowAdderssInv(const std::wstring & a_)
+{
+	int sz = a_.length();
+	if (a_.length()>0)
+	{
+	   return boost::lexical_cast<size_t>(a_)-1;
+	}
+	else
+		return 0;
+}
+void splitCellAddress(const std::wstring & a_, std::wstring & col, std::wstring & row)
+{   
+	std::wstring a = a_;
+
+	std::reverse(a.begin(), a.end());
+    ::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++)
+    {
+		if (a[i] >= L'0' && a[i] <= L'9')
+			row += a[i];
+		else
+			col += a[i];
+    }
+	std::reverse(col.begin(), col.end());
+	std::reverse(row.begin(), row.end());
+}
+
+void getCellAddressInv(const std::wstring & a_, int & col, int & row)
+{
+    std::wstring colStr=L"", rowStr=L"";
+    splitCellAddress(a_, colStr, rowStr);
+    
+    col = getColAddressInv(colStr);
+	row = getRowAdderssInv(rowStr);
+
+	if (col > 16384) col= -1;
+}
+
+bool IsRefPresent(const std::wstring& ref_test)
+{
+	int col = -1, row = -1;
+	getCellAddressInv(ref_test, col, row);
+
+	if (col >= 0 && row >=0) return true;
+	return false;
+}
 std::wstring oox2odf_converter::Impl::replace_cells_range_formater1(boost::wsmatch const & what)
 {
     const size_t sz = what.size();
@@ -238,12 +479,27 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater1(boost::wsmat
 
 			if (isFindBaseCell_ && table_name_.empty() && !sheet.empty())
 			{
-				table_name_ = sheet + L".$A$1";
+				table_name_ = L"$" + sheet + L".$A$1";
 			}	
 			if (!sheet.empty()  && (std::wstring::npos != c1.find(L"$"))) sheet = L"$"  + sheet;
+			if (!c2.empty() && c2.substr(0, 1) == L":") 
+				c2 = c2.substr(1);
 
-
-			s =  L"["  + sheet + L"." + c1 + (c2.empty() ? L"" : (L":" + sheet  + L"." + c2)) + std::wstring(L"]");
+			bool bRefPresent = true;
+			
+			if (sheet.empty() && c2.empty())
+			{
+				bRefPresent = IsRefPresent(c1);
+			}
+			
+			if (bRefPresent)
+			{
+				s =  L"["  + sheet + L"." + c1 + (c2.empty() ? L"" : (L":" + sheet  + L"." + c2)) + std::wstring(L"]");
+			}
+			else
+			{
+				s = c1;
+			}
 		}
         return s;
 	}
@@ -281,10 +537,12 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater2(boost::wsmat
 
 			if (isFindBaseCell_ && table_name_.empty() && !sheet.empty())
 			{
-				table_name_ = sheet + L".$A$1";
+				table_name_ = L"$" + sheet + L".$A$1";
 			}	
 			if (!sheet.empty()  && (std::wstring::npos != c1.find(L"$"))) sheet = L"$"  + sheet;
-
+			
+			if (!c2.empty() && c2.substr(0, 1) == L":") 
+				c2 = c2.substr(1);
 
 			s =  sheet + L"." + c1 + (c2.empty() ? L"" : (L":" + sheet  + L"." + c2)) + std::wstring(L"");
 		}
@@ -310,6 +568,19 @@ void oox2odf_converter::Impl::replace_named_formula(std::wstring & expr)
 	expr = convert_formula(expr);
 	isFindBaseCell_ = false;
 }
+bool oox2odf_converter::Impl::is_simple_ref(std::wstring const & expr)
+{
+	if (expr.find(L"(") != std::wstring::npos) return false;
+	if (expr.find(L" ") != std::wstring::npos) return false;
+	if (expr.find(L";") != std::wstring::npos) return false;
+
+	boost::wsmatch match;
+	if (boost::regex_search(expr, match, boost::wregex(L"([\\w]+\\!)?\\$?[a-zA-Z]+\\$?\\d+(\\:\\$?[a-zA-Z]+\\$?\\d+)?")))
+	{
+		return true;
+	}
+	return false;
+}
 
 void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 {
@@ -644,6 +915,11 @@ std::wstring oox2odf_converter::convert_named_formula(const std::wstring& expr)
     impl_->replace_named_formula(workstr);
     return workstr;
 }
+bool oox2odf_converter::is_simple_ref(std::wstring const & expr)
+{
+	return impl_->is_simple_ref(expr);
+}
+
 std::wstring oox2odf_converter::get_table_name()
 {
     return impl_->table_name_;
@@ -665,67 +941,6 @@ std::wstring oox2odf_converter::convert_spacechar(std::wstring expr)
 	}
 	return expr; 
 }
-size_t getColAddressInv(const std::wstring & a_)
-{
-    std::wstring a = a_;
-    ::boost::algorithm::to_upper(a);
-    static const size_t r = (L'Z' - L'A' + 1);
-    size_t mul = 1;
-    bool f = true;
-    size_t res = 0;
-
-	for (int i = a.length() - 1; i >= 0; i--)
-    {
-        size_t v = a[i] - L'A';
-        if (f)
-            f = false;
-        else
-            v += 1;
-        res += v * mul;
-        mul *= r;
-    }
-    return res;
-}
-
-size_t getRowAdderssInv(const std::wstring & a_)
-{
-	int sz = a_.length();
-	if (a_.length()>0)
-	{
-	   return boost::lexical_cast<size_t>(a_)-1;
-	}
-	else
-		return 0;
-}
-void splitCellAddress(const std::wstring & a_, std::wstring & col, std::wstring & row)
-{   
-	std::wstring a = a_;
-
-	std::reverse(a.begin(), a.end());
-    ::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++)
-    {
-		if (a[i] >= L'0' && a[i] <= L'9')
-			row += a[i];
-		else
-			col += a[i];
-    }
-	std::reverse(col.begin(), col.end());
-	std::reverse(row.begin(), row.end());
-}
-
-void getCellAddressInv(const std::wstring & a_, int & col, int & row)
-{
-    std::wstring colStr=L"", rowStr=L"";
-    splitCellAddress(a_, colStr, rowStr);
-    
-    col = getColAddressInv(colStr);
-    row = getRowAdderssInv(rowStr);
-}
-
 int oox2odf_converter::get_count_value_points(std::wstring expr)
 {
 	int count =0;

ASCOfficeOdfFile/include/common/readdocelement.h

@@ -63,8 +63,9 @@ public:
 
     virtual void add_child_element	( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name) = 0;
 private:
-    virtual void add_attributes		( const xml::attributes_wc_ptr & Attributes ) = 0;
+    virtual void add_attributes		(const xml::attributes_wc_ptr & Attributes) = 0;
     virtual void add_text			(const std::wstring & Text) = 0;
+    virtual void add_space			(const std::wstring & Text) = 0;
 
 };
 

ASCOfficeOdfFile/include/odf/odf_elements_type.h

@@ -39,7 +39,8 @@ enum ElementType
     typeNone = 0,
     type_AbstractXml,
 
-    typeTextText = 1000,
+	typeTextTextElement = 1000, 
+    typeTextText,
     typeTextS,
     typeTextTab,
     typeTextLineBreak,
@@ -247,6 +248,7 @@ enum ElementType
     typeStyleTableColumnProperties,
     typeStyleTableRowProperties,
     typeStyleTableCellProperties,
+	typeStyleHeaderFooter,
     typeStyleHeader,
     typeStyleFooter,
     typeStyleHeaderFirst,
@@ -468,6 +470,7 @@ enum ElementType
 	typeDrawHandle,
 	typeDrawEquation,
 	typeDrawEnhancedGeometry,
+	typeDrawGluePoint,
 
 	typeDr3dScene,
 	typeDr3dLight,
@@ -506,6 +509,7 @@ enum ElementType
 	typeFormTime,
 	typeFormValueRange,
 	typeFormItem,
+	typeFormOption,
 
 	typeDrawPage,    
 	typePresentationFooterDecl,
@@ -533,7 +537,10 @@ enum ElementType
 	typeOfficeAnnotation,
 	typeOfficeAnnotationStart,
 	typeOfficeAnnotationEnd,
+	typeStyleRegion,
 	typeStyleRegionLeft,
+	typeStyleRegionCenter,
+    typeStyleRegionRight,
 	typeOfficeScripts,
 	typeOfficeScript,
 	typeOfficePresentation,
@@ -589,8 +596,6 @@ enum ElementType
 	typeChartRegressionCurve,
 	typeChartEquation,
 
-	typeStyleRegionCenter,
-    typeStyleRegionRight,
 	typeStyleChartProperties,
 
 	typeCalcextColorScaleEntry,

ASCOfficeOdfFile/src/common/readdocelement.cpp

@@ -82,6 +82,11 @@ bool read_doc_element::read_sax( xml::sax * Reader )
 				}
 				break;
 			case xml::typeWhitespace:
+				{
+					const std::wstring value = Reader->value();
+					add_space(value);
+				}
+				break;
 			case xml::typeText:
 				{
 					const std::wstring value = Reader->value();

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -47,6 +47,7 @@
 #include "../odf/style_graphic_properties.h"
 
 #include "docx_package.h"
+#include "xlsx_package.h"
 #include "oox_rels.h"
 #include "logging.h"
 
@@ -130,7 +131,7 @@ text_tracked_context::_state & text_tracked_context::get_tracked_change(std::wst
 }
 
 //----------------------------------------------------------------------------------------------------------------
-docx_conversion_context::docx_conversion_context(odf_reader::odf_document * OdfDocument) : 
+docx_conversion_context::docx_conversion_context(odf_reader::odf_document * _odf_document) : 
 	last_dump_page_properties_	(true),
 	next_dump_page_properties_	(false),
 	page_break_					(false),
@@ -143,19 +144,22 @@ docx_conversion_context::docx_conversion_context(odf_reader::odf_document * OdfD
 	text_tracked_context_		(*this),
 	table_context_				(*this),
 	output_document_			(NULL),
-	process_note_				(noNote),
+	current_process_note_		(noNote),
 	new_list_style_number_		(0),
 	current_margin_left_		(0),
+	current_outline_level_		(-1),
 	is_rtl_						(false),
 	is_delete_text_				(false),
 	delayed_converting_			(false),
 	process_headers_footers_	(false),
-	process_comment_			(false),
-	mediaitems_					(OdfDocument->get_folder() ),
-	math_context_				(OdfDocument->odf_context().fontContainer(), false),
-	odf_document_				(OdfDocument)
+        current_process_comment_	(false),
+	odf_document_				(_odf_document),
+	math_context_				(_odf_document->odf_context().fontContainer(), false)
 {
-	streams_man_		= streams_man::create(temp_stream_);
+	mediaitems_ = boost::make_shared<mediaitems>(odf_document_->get_folder());
+	chart_drawing_handle_ =  boost::make_shared<xlsx_drawing_context_handle>(mediaitems_);
+	
+	streams_man_ = streams_man::create(temp_stream_);
 }
 docx_conversion_context::~docx_conversion_context()
 {
@@ -166,7 +170,7 @@ 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);
+	mediaitems_->set_font_directory(pathFonts);
 }
 std::wstring styles_map::get(const std::wstring & Name, odf_types::style_family::type Type)
 {
@@ -369,6 +373,9 @@ void docx_conversion_context::start_index_content()
 				sInstrText += L" \\n "+	std::to_wstring(table_content_context_.min_outline_level) + L"-" + 
 										std::to_wstring(table_content_context_.max_outline_level);
 		}
+		else if (table_content_context_.type_table_content == 1)
+			sInstrText += L" \\o";
+
 		if (false == table_content_context_.outline_level_styles.empty())
 		{
 			sInstrText += L" \\t \"";
@@ -615,9 +622,9 @@ std::wstring docx_conversion_context::add_hyperlink(const std::wstring & href, b
 {
 	hyperlinks::_type_place type = hyperlinks::document_place;
 	
-	if (process_comment_ == true)											type = hyperlinks::comment_place;
-	else if	(process_note_ == footNote	|| process_note_ == footNoteRefSet)	type = hyperlinks::footnote_place;
-	else if	(process_note_ == endNote	|| process_note_ == endNoteRefSet )	type = hyperlinks::endnote_place;
+		 if (current_process_comment_ == true)												type = hyperlinks::comment_place;
+	else if	(current_process_note_ == footNote	|| current_process_note_ == footNoteRefSet)	type = hyperlinks::footnote_place;
+	else if	(current_process_note_ == endNote	|| current_process_note_ == endNoteRefSet )	type = hyperlinks::endnote_place;
 	
 	std::wstring href_correct = xml::utils::replace_text_to_xml(href);
     XmlUtils::replace_all( href_correct, L" .", L".");//1 (130).odt
@@ -681,11 +688,14 @@ void docx_conversion_context::end_document()
 {
     output_stream() << L"</w:document>";
 
-    output_document_->get_word_files().set_document	( package::simple_element::create(L"document.xml", document_xml_.str()) );
+	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_comments	( comments_context_);
-    output_document_->get_word_files().set_headers_footers( headers_footers_);
+	output_document_->get_word_files().set_headers_footers( headers_footers_);
+ 
+	package::xl_drawings_ptr drawings = package::xl_drawings::create(chart_drawing_handle_->content(), chart_drawing_handle_->content_vml());
+	output_document_->get_word_files().set_drawings(drawings);
 
 	package::content_types_file	& content_file_ = output_document_->get_content_types_file();
 	content_file_.set_media( mediaitems_);
@@ -810,6 +820,16 @@ std::wstring  docx_conversion_context::dump_settings_document()
 			{
 				CP_XML_NODE(L"w:mirrorMargins");
 			}
+			
+			CP_XML_NODE(L"w:compat")
+			{
+				CP_XML_NODE(L"w:compatSetting")
+				{
+					CP_XML_ATTR(L"w:name",  L"compatibilityMode" );
+					CP_XML_ATTR(L"w:uri",  L"http://schemas.microsoft.com/office/word" );
+					CP_XML_ATTR(L"w:val",  L"15" );
+				}
+			}
 		}
 	}
 	return output.str();
@@ -852,9 +872,12 @@ namespace
         }
     }
 
-    std::wstring StyleDisplayName(const std::wstring & Name, odf_types::style_family::type Type)
+    std::wstring StyleDisplayName(const std::wstring & Name, const std::wstring & DisplayName, odf_types::style_family::type Type)
     {
-        if (!Name.empty())
+        if (!DisplayName.empty())
+            return DisplayName;
+
+		if (!Name.empty())
             return Name;
         else
         {
@@ -930,8 +953,8 @@ mc:Ignorable=\"w14 wp14\">";
 
 	for (size_t i = 0; i < numIds.size(); i++)
     {
-        strm << L"<w:num w:numId=\"" << numIds[i] << L"\" >";
-        strm << L"<w:abstractNumId w:val=\"" << numIds[i] << "\" />";
+        strm << L"<w:num w:numId=\"" << numIds[i] << L"\">";
+        strm << L"<w:abstractNumId w:val=\"" << numIds[i] << "\"/>";
         strm << L"</w:num>";    
     }
 
@@ -957,19 +980,19 @@ void docx_conversion_context::process_fonts()
 			if (!arFonts[i]) continue;
 			if (arFonts[i]->name().empty()) continue;
 
-            strm << L"<w:font w:name=\"" << arFonts[i]->name() << L"\" >";
+            strm << L"<w:font w:name=\"" << arFonts[i]->name() << L"\">";
 
             if (!arFonts[i]->charset().empty())
-                strm << L"<w:charset w:val=\"" << arFonts[i]->charset() <<"\" />";
+                strm << L"<w:charset w:val=\"" << arFonts[i]->charset() <<"\"/>";
 
             if (!arFonts[i]->family().empty())
-                strm << L"<w:family w:val=\"" << arFonts[i]->family() << "\" />";
+                strm << L"<w:family w:val=\"" << arFonts[i]->family() << "\"/>";
 
             if (!arFonts[i]->pitch().empty())
-                strm << L"<w:pitch w:val=\"" << arFonts[i]->pitch() << "\" />";
+                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() << "\" />";
+                strm << L"<w:altName w:val=\"" << arFonts[i]->alt_name() << "\"/>";
 
             strm << L"</w:font>";
         }
@@ -992,7 +1015,7 @@ void docx_conversion_context::process_styles()
 	_Wostream << L"xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" "; 
 	_Wostream << L"xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" "; 
 	_Wostream << L"xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" ";
-	_Wostream << L"mc:Ignorable=\"w14\"> ";
+	_Wostream << L"mc:Ignorable=\"w14\">";
 	
     if (odf_reader::odf_document * doc = root())
     {
@@ -1062,30 +1085,34 @@ void docx_conversion_context::process_styles()
 				}
 				_Wostream << L">";
 
-                const std::wstring displayName = StyleDisplayName(arStyles[i]->name(), arStyles[i]->type());
+                const std::wstring displayName = StyleDisplayName(arStyles[i]->name(), arStyles[i]->display_name(), arStyles[i]->type());
 
-                _Wostream << L"<w:name w:val=\"" << displayName << L"\" />";
+				_Wostream << L"<w:name w:val=\"" << XmlUtils::EncodeXmlString(displayName) << L"\"/>";
 
                 if (odf_reader::style_instance * baseOn = arStyles[i]->parent())
                 {
                     const std::wstring basedOnId = styles_map_.get(baseOn->name(), baseOn->type());
-                    _Wostream << L"<w:basedOn w:val=\"" << basedOnId << "\" />";
+                    _Wostream << L"<w:basedOn w:val=\"" << basedOnId << "\"/>";
                 }
                 else if (!arStyles[i]->is_default() && styles_map_.check(L"", arStyles[i]->type()))
                 {
                     const std::wstring basedOnId = styles_map_.get(L"", arStyles[i]->type());
-                    _Wostream << L"<w:basedOn w:val=\"" << basedOnId << "\" />";
+                    _Wostream << L"<w:basedOn w:val=\"" << basedOnId << "\"/>";
                 }
+				else
+				{
+					_Wostream << L"<w:qFormat/>";
+				}
 
                 if (odf_reader::style_instance * next = arStyles[i]->next())
                 {
                     const std::wstring nextId = styles_map_.get(next->name(), next->type());
-                    _Wostream << L"<w:next w:val=\"" << nextId << "\" />";
+                    _Wostream << L"<w:next w:val=\"" << nextId << "\"/>";
                 }
                 else if (arStyles[i]->is_default())
                 {
                     // self
-                    _Wostream << L"<w:next w:val=\"" << id << "\" />";
+                    _Wostream << L"<w:next w:val=\"" << id << "\"/>";
                 }
 
                 if (odf_reader::style_content * content = arStyles[i]->content())
@@ -1334,6 +1361,7 @@ void docx_conversion_context::end_automatic_style()
     in_automatic_style_ = false;
     automatic_parent_style_.clear();
 	tabs_context_.clear();
+	current_outline_level_ = -1;
 }
 
 bool docx_conversion_context::in_automatic_style()
@@ -1452,7 +1480,7 @@ void docx_conversion_context::end_text_list_style()
     text_list_style_name_ = L"";
 }
 
-const std::wstring & docx_conversion_context::get_text_list_style_name()
+std::wstring docx_conversion_context::get_text_list_style_name()
 {
     return text_list_style_name_;
 }
@@ -1478,9 +1506,9 @@ void docx_conversion_context::end_list()
     list_style_stack_.pop_back();
 }
 
-const std::wstring docx_conversion_context::current_list_style() const
+std::wstring docx_conversion_context::current_list_style()
 {
-    if (!list_style_stack_.empty())
+    if (false == list_style_stack_.empty())
         return list_style_stack_.back();    
     else
         return L"";
@@ -1533,6 +1561,92 @@ int docx_conversion_context::process_text_attr(odf_reader::text::paragraph_attrs
 	push_text_properties(styleContent->get_style_text_properties());
 	return 1;
 }
+int docx_conversion_context::process_paragraph_style(const std::wstring & style_name)
+{
+	if (style_name.empty()) return 0;
+
+	if (odf_reader::style_instance * styleInst =
+			root()->odf_context().styleContainer().style_by_name(style_name, odf_types::style_family::Paragraph, process_headers_footers_))
+    {
+		double font_size = odf_reader::text_format_properties_content::process_font_size_impl(odf_types::font_size(odf_types::percent(100.0)), styleInst);
+		if (font_size > 0) current_fontSize.push_back(font_size);
+		
+		process_page_break_after(styleInst);
+
+		if (styleInst->is_automatic())
+        {
+            if (odf_reader::style_content * styleContent = styleInst->content())
+            {
+                std::wstring id;
+				//office_element_ptr parent_tab_stops_;
+                if (const odf_reader::style_instance * parentStyleContent = styleInst->parent())
+				{
+					std::wstring parent_name = parentStyleContent->name();
+                    id = styles_map_.get( parent_name, parentStyleContent->type() );
+
+					if (in_table_content_ && table_content_context_.empty_current_table_content_level_index())
+					{
+						table_content_context_.set_current_level(parent_name);
+					}
+				}
+
+                start_automatic_style(id);
+
+				calc_tab_stops(styleInst, get_tabs_context());
+				
+				//вытаскивает rtl c цепочки стилей !! - просто прописать в наследуемом НЕЛЬЗЯ !!
+				odf_reader::paragraph_format_properties properties = odf_reader::calc_paragraph_properties_content(styleInst);
+				if (properties.style_writing_mode_)
+				{
+					odf_types::writing_mode::type type = properties.style_writing_mode_->get_type();
+					switch(type)
+					{
+					case odf_types::writing_mode::RlTb:
+					case odf_types::writing_mode::TbRl:
+					case odf_types::writing_mode::Rl:
+						set_rtl(true);
+						break;
+					default:
+						set_rtl(false);
+					}
+				}
+
+				styleContent->docx_convert(*this);                
+               
+				end_automatic_style();
+
+                //push_text_properties(styleContent->get_style_text_properties());
+				return 1;
+            }            
+        }
+        else
+        {
+            const std::wstring id = styles_map_.get( styleInst->name(), styleInst->type() );
+            output_stream() << L"<w:pPr>";
+
+			output_stream() << L"<w:pStyle w:val=\"" << id << L"\" />";
+
+			if (!get_text_tracked_context().dumpPPr_.empty())
+			{
+				output_stream() << get_text_tracked_context().dumpPPr_;
+				get_text_tracked_context().dumpPPr_.clear();
+			}
+
+			serialize_list_properties(output_stream());
+			
+			if (!get_text_tracked_context().dumpRPrInsDel_.empty())
+			{
+				output_stream() << L"<w:rPr>";
+					output_stream() << get_text_tracked_context().dumpRPrInsDel_;
+					get_text_tracked_context().dumpRPrInsDel_.clear();
+				output_stream() << L"</w:rPr>";
+			}
+            output_stream() << L"</w:pPr>";
+			return 2;
+		}
+	}
+	return 0;
+}
 int docx_conversion_context::process_paragraph_attr(odf_reader::text::paragraph_attrs *Attr)
 {
 	if (!Attr) return 0;
@@ -1553,18 +1667,22 @@ int docx_conversion_context::process_paragraph_attr(odf_reader::text::paragraph_
 		if (odf_reader::style_instance * styleInst =
 				root()->odf_context().styleContainer().style_by_name(Attr->text_style_name_, odf_types::style_family::Paragraph, process_headers_footers_)
             )
-        {
-            process_page_break_after(styleInst);
-            if (styleInst->is_automatic())
-            {
-                if (odf_reader::style_content * styleContent = styleInst->content())
-                {
-                    std::wstring id;
+		{
+			double font_size = odf_reader::text_format_properties_content::process_font_size_impl(odf_types::font_size(odf_types::percent(100.0)), styleInst);
+			if (font_size > 0) current_fontSize.push_back(font_size);
+			
+			process_page_break_after(styleInst);
+
+			if (styleInst->is_automatic())
+			{
+				if (odf_reader::style_content * styleContent = styleInst->content())
+				{
+					std::wstring id;
 					//office_element_ptr parent_tab_stops_;
-                    if (const odf_reader::style_instance * parentStyleContent = styleInst->parent())
+					if (const odf_reader::style_instance * parentStyleContent = styleInst->parent())
 					{
 						std::wstring parent_name = parentStyleContent->name();
-                        id = styles_map_.get( parent_name, parentStyleContent->type() );
+						id = styles_map_.get( parent_name, parentStyleContent->type() );
 
 						if (in_table_content_ && table_content_context_.empty_current_table_content_level_index())
 						{
@@ -1572,7 +1690,7 @@ int docx_conversion_context::process_paragraph_attr(odf_reader::text::paragraph_
 						}
 					}
 
-                    start_automatic_style(id);
+					start_automatic_style(id);
 
 					calc_tab_stops(styleInst, get_tabs_context());
 					
@@ -1592,13 +1710,15 @@ int docx_conversion_context::process_paragraph_attr(odf_reader::text::paragraph_
 							set_rtl(false);
 						}
 					}
-					set_margin_left(properties.fo_margin_left_? 20.0 * properties.fo_margin_left_->get_length().get_value_unit(odf_types::length::pt) : 0); 
-                    
+					if ((Attr->outline_level_) && (*Attr->outline_level_ > 0))
+					{
+						set_outline_level(*Attr->outline_level_ - 1);
+					}
 					styleContent->docx_convert(*this);                
-                   
+	               
 					end_automatic_style();
 
-                    push_text_properties(styleContent->get_style_text_properties());
+					push_text_properties(styleContent->get_style_text_properties());
 
 					if (!get_section_context().dump_.empty()
 						&& !get_table_context().in_table()
@@ -1614,6 +1734,8 @@ int docx_conversion_context::process_paragraph_attr(odf_reader::text::paragraph_
 							output_stream() << L"</w:pPr>";
 							finish_paragraph();
 							start_paragraph();
+							//process_paragraph_style(Context.get_current_paragraph_style()); ??
+
 							if ((Attr->outline_level_) && (*Attr->outline_level_ > 0))
 							{
 								output_stream() << L"<w:pPr>";
@@ -1632,65 +1754,59 @@ int docx_conversion_context::process_paragraph_attr(odf_reader::text::paragraph_
 							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;
-                }            
-            }
-            else
-            {
-                const std::wstring id = styles_map_.get( styleInst->name(), styleInst->type() );
-                output_stream() << L"<w:pPr>";
-//todooo причесать			
-					if (!get_section_context().dump_.empty()
-						&& !get_table_context().in_table()
-						&& (get_process_note() == oox::docx_conversion_context::noNote)
-						&& !in_drawing)
+				}            
+			}
+			else
+			{
+				const std::wstring id = styles_map_.get( styleInst->name(), styleInst->type() );
+				output_stream() << L"<w:pPr>";
+	//todooo причесать			
+				if (!get_section_context().dump_.empty()
+					&& !get_table_context().in_table()
+					&& (get_process_note() == oox::docx_conversion_context::noNote)
+					&& !in_drawing)
+				{
+					if (is_paragraph_header() )
 					{
-						if (is_paragraph_header() )
-						{
-							output_stream() << get_section_context().dump_;
-							get_section_context().dump_.clear();
+						output_stream() << get_section_context().dump_;
+						get_section_context().dump_.clear();
 
-							output_stream() << L"</w:pPr>";
-							finish_paragraph();
-							start_paragraph();					
-							output_stream() << L"<w:pPr>";
-						}
-						else
-						{
-							output_stream() << get_section_context().dump_;
-							get_section_context().dump_.clear();
-						}
+						output_stream() << L"</w:pPr>";
+						finish_paragraph();
+						start_paragraph();					
+						output_stream() << L"<w:pPr>";
 					}
-
-					output_stream() << L"<w:pStyle w:val=\"" << id << L"\" />";
-
-					if (!get_text_tracked_context().dumpPPr_.empty())
+					else
 					{
-						output_stream() << get_text_tracked_context().dumpPPr_;
-						get_text_tracked_context().dumpPPr_.clear();
+						output_stream() << get_section_context().dump_;
+						get_section_context().dump_.clear();
 					}
+				}
 
-					serialize_list_properties(output_stream());
-					
-					if ((Attr->outline_level_) && (*Attr->outline_level_ > 0))
-					{
-						output_stream() << L"<w:outlineLvl w:val=\"" << *Attr->outline_level_ - 1 << L"\" />";
-					}
+				output_stream() << L"<w:pStyle w:val=\"" << id << L"\" />";
 
-					if (!get_text_tracked_context().dumpRPrInsDel_.empty())
-					{
-						output_stream() << L"<w:rPr>";
-							output_stream() << get_text_tracked_context().dumpRPrInsDel_;
-							get_text_tracked_context().dumpRPrInsDel_.clear();
-						output_stream() << L"</w:rPr>";
-					}
-                output_stream() << L"</w:pPr>";
+				if (!get_text_tracked_context().dumpPPr_.empty())
+				{
+					output_stream() << get_text_tracked_context().dumpPPr_;
+					get_text_tracked_context().dumpPPr_.clear();
+				}
+
+				serialize_list_properties(output_stream());
+				
+				if ((Attr->outline_level_) && (*Attr->outline_level_ > 0))
+				{
+					output_stream() << L"<w:outlineLvl w:val=\"" << *Attr->outline_level_ - 1 << L"\" />";
+				}
+
+				if (!get_text_tracked_context().dumpRPrInsDel_.empty())
+				{
+					output_stream() << L"<w:rPr>";
+						output_stream() << get_text_tracked_context().dumpRPrInsDel_;
+						get_text_tracked_context().dumpRPrInsDel_.clear();
+					output_stream() << L"</w:rPr>";
+				}
+				output_stream() << L"</w:pPr>";
 				return 2;
 			}
 		}
@@ -1741,28 +1857,27 @@ void docx_conversion_context::process_page_break_after(const odf_reader::style_i
 }
 void docx_conversion_context::serialize_list_properties(std::wostream & strm)
 {
-    if (!list_style_stack_.empty())
+    if (list_style_stack_.empty()) return;
+   
+	if (first_element_list_item_)
     {
-        if (first_element_list_item_)
-        {
-            const int id = root()->odf_context().listStyleContainer().id_by_name( current_list_style() );
+        const int id = root()->odf_context().listStyleContainer().id_by_name( current_list_style() );
 
-			CP_XML_WRITER(strm)
+		CP_XML_WRITER(strm)
+		{
+			CP_XML_NODE(L"w:numPr")
 			{
-				CP_XML_NODE(L"w:numPr")
+				CP_XML_NODE(L"w:ilvl")
 				{
-					CP_XML_NODE(L"w:ilvl")
-					{
-						CP_XML_ATTR(L"w:val", (list_style_stack_.size() - 1));
-					}
-					CP_XML_NODE(L"w:numId")
-					{
-						CP_XML_ATTR(L"w:val", id );
-					}
+					CP_XML_ATTR(L"w:val", (list_style_stack_.size() - 1));
+				}
+				CP_XML_NODE(L"w:numId")
+				{
+					CP_XML_ATTR(L"w:val", id );
 				}
 			}
-            first_element_list_item_ = false;
-        }
+		}
+        first_element_list_item_ = false;
     }
 }
 
@@ -1818,7 +1933,7 @@ namespace
 		//слить если есть mediaitems, добавить релсы и обнулить их для основного документа.
 		rels internal_rels;
 
-		Context.get_mediaitems().dump_rels(internal_rels);
+		Context.get_mediaitems()->dump_rels(internal_rels);
 		Context.dump_hyperlinks(internal_rels, hyperlinks::document_place);
 
 		Context.get_headers_footers().add(styleName, dbgStr, type, internal_rels);
@@ -1928,12 +2043,12 @@ void notes_context::dump_rels(rels & Rels) const
 
 void docx_conversion_context::add_note_reference ()
 {
-    if (process_note_ == footNote || process_note_ ==  endNote)
+    if (current_process_note_ == footNote || current_process_note_ ==  endNote)
     {
         add_element_to_run(_T(""));
-        output_stream() << ((process_note_ == footNote) ? L"<w:footnoteRef />" : L"<w:endnoteRef />");
+        output_stream() << ((current_process_note_ == footNote) ? L"<w:footnoteRef />" : L"<w:endnoteRef />");
         finish_run();
-        process_note_ = (NoteType) (process_note_ + 1); //add ref set
+        current_process_note_ = (NoteType) (current_process_note_ + 1); //add ref set
     }
 }
 
@@ -1982,7 +2097,7 @@ void docx_conversion_context::start_text_changes (const std::wstring &id)
 void docx_conversion_context::start_changes()
 {
 	if (map_current_changes_.empty()) return;
-	if (process_comment_) return;
+	if (current_process_comment_) return;
 
 	text_tracked_context_.dumpPPr_.clear();
 	text_tracked_context_.dumpRPr_.clear();
@@ -2081,7 +2196,7 @@ void docx_conversion_context::start_changes()
 
 void docx_conversion_context::end_changes()
 {
-	if (process_comment_) return;
+	if (current_process_comment_) return;
 
 	for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); ++it)
 	{

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -42,6 +42,7 @@
 #include "docx_table_context.h"
 #include "oox_conversion_context.h"
 #include "oox_chart_context.h"
+#include "xlsx_drawing_context.h"
 
 #include "headers_footers.h"
 #include "hyperlinks.h"
@@ -734,7 +735,7 @@ class docx_conversion_context : boost::noncopyable
 public:
 	enum NoteType { noNote, footNote, footNoteRefSet, endNote, endNoteRefSet };
 	
-	docx_conversion_context(odf_reader::odf_document * OdfDocument);
+	docx_conversion_context(odf_reader::odf_document * _odf_document);
 	~docx_conversion_context();
 
 	void set_output_document	(package::docx_document * document);
@@ -829,6 +830,7 @@ public:
     bool process_page_properties(std::wostream & strm);
 	void process_section		(std::wostream & strm, odf_reader::style_columns * columns = NULL);
 	
+	int process_paragraph_style (const std::wstring & style_name);
 	int process_paragraph_attr	(odf_reader::text::paragraph_attrs *attr);
 	int process_text_attr		(odf_reader::text::paragraph_attrs *Attr);
 	void process_page_break_after(const odf_reader::style_instance *styleInst);
@@ -872,8 +874,8 @@ public:
     void start_text_list_style	(const std::wstring & StyleName);
     void end_text_list_style	();
     
-	const std::wstring &	get_text_list_style_name();
-	const std::wstring		current_list_style		() const;
+	std::wstring	get_text_list_style_name();
+	std::wstring	current_list_style();
  
 	void start_list				(const std::wstring & StyleName, bool Continue = false);
     void end_list				();
@@ -887,7 +889,7 @@ public:
 
     styles_map			* get_style_map()			{ return &styles_map_; }
 
-	mediaitems			& get_mediaitems()			{return mediaitems_;}
+	mediaitems_ptr		& get_mediaitems()			{return mediaitems_;}
     styles_context		& get_styles_context()		{ return styles_context_; }
     drawing_context		& get_drawing_context()		{ return drawing_context_; } 	
 	comments_context	& get_comments_context()	{ return comments_context_; }
@@ -897,8 +899,9 @@ public:
 	text_tracked_context& get_text_tracked_context(){ return text_tracked_context_; }
 	forms_context		& get_forms_context()		{ return forms_context_; }
 	tabs_context		& get_tabs_context()		{ return tabs_context_;}
+	table_content_context & get_table_content_context()	{ return table_content_context_;}
 	
-	table_content_context	& get_table_content_context()	{ return table_content_context_;}
+	xlsx_drawing_context_handle_ptr & get_chart_drawing_handle() { return chart_drawing_handle_;} 
 
 	void set_drawing_text_props (const std::wstring &props);
 
@@ -910,23 +913,29 @@ public:
     StreamsManPtr	get_stream_man() const				{ return streams_man_; }
     void			set_stream_man(StreamsManPtr Sm)	{ streams_man_ = Sm; }
 
-    void set_rtl(bool val)	{ is_rtl_ = val; }
-    bool get_rtl() const	{return is_rtl_;}
+    void set_rtl(bool val)			{ is_rtl_ = val; }
+    bool get_rtl() const			{return is_rtl_;}
    
-	void set_margin_left(int val)	{current_margin_left_ = val;}
-	int get_margin_left()			{return current_margin_left_;}
+	double get_current_fontSize()	{return current_fontSize.empty() ? 0 : current_fontSize.back();}
+	void pop_current_fontSize()		{if (!current_fontSize.empty()) current_fontSize.pop_back();}
+	
+	void set_outline_level(int val)	{current_outline_level_ = val;}
+	int get_outline_level()			{return current_outline_level_;}
 
-	void set_process_note		(NoteType Val) { process_note_ = Val; }
-	NoteType get_process_note	() const		{ return process_note_; }
+	void set_process_note		(NoteType Val) { current_process_note_ = Val; }
+	NoteType get_process_note	() const		{ return current_process_note_; }
 	void add_note_reference		();
 
+	void start_paragraph_style(const std::wstring& style_name) {paragraph_style_stack_.push_back(style_name);}
+	void end_paragraph_style() { if (!paragraph_style_stack_.empty()) paragraph_style_stack_.pop_back();}
+	std::wstring get_current_paragraph_style()	{return paragraph_style_stack_.empty() ? L"" : paragraph_style_stack_.back();}
+	
 	oox_chart_context & current_chart();
     void start_chart(std::wstring name);
     void end_chart	();
 
-	void start_comment	()	{process_comment_ = true;}
-	void end_comment	()	{process_comment_ = false;}
-	bool process_comment_;
+	void start_comment	()	{current_process_comment_ = true;}
+	void end_comment	()	{current_process_comment_ = false;}
    
 	void start_math_formula	();
 	void end_math_formula	();
@@ -945,7 +954,7 @@ public:
    
 	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_;
@@ -956,6 +965,7 @@ public:
 	void		end_changes();
 
 	void		add_jsaProject(const std::string &content);
+
 private:
 
 	struct _context_state
@@ -982,6 +992,8 @@ private:
     std::wstringstream		settings_xml_;
     std::wstringstream		meta_xml_;
 
+	xlsx_drawing_context_handle_ptr chart_drawing_handle_; 
+
 	styles_context			styles_context_;
 	math_context			math_context_;
     drawing_context			drawing_context_;
@@ -1004,18 +1016,18 @@ private:
 	std::vector<odf_reader::_property>		settings_properties_;
 
 	hyperlinks								hyperlinks_;
-    mediaitems								mediaitems_;     
+    mediaitems_ptr							mediaitems_;     
 	std::vector<oox_chart_context_ptr>		charts_;
     headers_footers							headers_footers_;
 
-    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_;
+    std::wstring				automatic_parent_style_; 
+    std::wstring				current_master_page_name_;
+	std::wstring				text_list_style_name_;	
+	std::vector<std::wstring>	paragraph_style_stack_;
+	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_;
@@ -1029,10 +1041,13 @@ private:
 	bool is_delete_text_;
     bool is_rtl_; // right-to-left
  
-	std::wstring current_alphabetic_index_;
-	int current_margin_left_;
-    int new_list_style_number_;	// счетчик для нумерации имен созданных в процессе конвертации стилей
-	NoteType process_note_;
+	NoteType			current_process_note_;
+	bool				current_process_comment_;
+	std::vector<double> current_fontSize;
+	std::wstring		current_alphabetic_index_;
+	int					current_margin_left_;
+	int					current_outline_level_;
+    int					new_list_style_number_;	// счетчик для нумерации имен созданных в процессе конвертации стилей
     
 	std::vector<odf_reader::office_element*>							delayed_elements_;
 

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -151,7 +151,6 @@ void serialize_wrap(std::wostream & strm, _docx_drawing const & val)
 				break;
 			case odf_types::style_wrap::Left:
 			case odf_types::style_wrap::Right:
-			case odf_types::style_wrap::Dynamic:
 				serialize_wrap_square(strm, val);
 				break;
 			case odf_types::style_wrap::RunThrough:
@@ -160,6 +159,7 @@ void serialize_wrap(std::wostream & strm, _docx_drawing const & val)
 			case odf_types::style_wrap::None:
 				serialize_wrap_top_bottom(strm, val);
 				break;
+			case odf_types::style_wrap::Dynamic:
 			default:
 				CP_XML_NODE(L"wp:wrapTopAndBottom");
 				break;
@@ -232,6 +232,7 @@ void docx_serialize_image_child(std::wostream & strm, _docx_drawing & val)
 				}
 
 				oox_serialize_ln(CP_XML_STREAM(), val.additional);
+				oox_serialize_effects(CP_XML_STREAM(), val.additional);
 			}
 		}
 	}
@@ -267,6 +268,7 @@ void docx_serialize_shape_child(std::wostream & strm, _docx_drawing & val)
 				val.serialize_shape	(CP_XML_STREAM());
 
 				oox_serialize_ln(CP_XML_STREAM(), val.additional);
+				oox_serialize_effects(CP_XML_STREAM(), val.additional);
 			} 
 			val.serialize_text(CP_XML_STREAM());
 		}

ASCOfficeOdfFile/src/docx/docx_package.cpp

@@ -102,7 +102,11 @@ void word_files::write(const std::wstring & RootPath)
     {
         embeddings_->write( path );
     }
-
+	if (drawings_)
+    {
+        drawings_->set_main_document(get_main_document());
+        drawings_->write( path );
+    }
 	if (headers_footers_)
     {
         headers_footers_->write( path );
@@ -140,22 +144,22 @@ void word_files::write(const std::wstring & RootPath)
 
 void word_files::update_rels(docx_conversion_context & Context)
 {
-    Context.get_mediaitems().dump_rels(rels_files_.get_rel_file()->get_rels());
+    Context.get_mediaitems()->dump_rels(rels_files_.get_rel_file()->get_rels());
 	
 	Context.dump_hyperlinks		(rels_files_.get_rel_file()->get_rels(), hyperlinks::document_place);
     Context.dump_headers_footers(rels_files_.get_rel_file()->get_rels());
     Context.dump_notes			(rels_files_.get_rel_file()->get_rels());
 }
 
-void word_files::set_media(mediaitems & _Mediaitems)
+void word_files::set_media(mediaitems_ptr & _mediaitems)
 {
-	if (_Mediaitems.count_image + _Mediaitems.count_media > 0)
+	if (_mediaitems->count_image + _mediaitems->count_media > 0)
 	{
-		media_ = element_ptr( new media(_Mediaitems, _Mediaitems.applicationFonts()) );
+		media_ = element_ptr( new media(_mediaitems, _mediaitems->applicationFonts()) );
 	}
-	if (_Mediaitems.count_object > 0)
+	if (_mediaitems->count_object > 0)
 	{
-		embeddings_ = element_ptr( new embeddings(_Mediaitems) );
+		embeddings_ = element_ptr( new embeddings(_mediaitems) );
 		embeddings_->set_main_document( get_main_document() );
 	}
 }
@@ -195,6 +199,10 @@ void word_files::add_jsaProject(const std::string &content)
 {
 	jsaProject_ = package::simple_element::create(L"jsaProject.bin", content);
 }
+void word_files::set_drawings(element_ptr Element)
+{
+    drawings_ = Element;
+}
 void word_files::set_headers_footers(headers_footers & HeadersFooters)
 {
     headers_footers_elements * elm = new headers_footers_elements(HeadersFooters); 

ASCOfficeOdfFile/src/docx/docx_package.h

@@ -137,10 +137,11 @@ 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_ptr		& mediaitems_);
     void set_headers_footers(headers_footers	& HeadersFooters);
     void set_notes			(notes_context		& notesContext);
     void set_comments		(comments_context	& commentsContext);
+    void set_drawings		(element_ptr Element);
 
 	void add_charts(chart_content_ptr chart);
 	void add_jsaProject(const std::string &content);
@@ -163,6 +164,7 @@ private:
     element_ptr settings_;
     element_ptr comments_;
     element_ptr jsaProject_;
+	element_ptr drawings_;
 
 };
 

ASCOfficeOdfFile/src/docx/drawing_object_description.h

@@ -62,6 +62,9 @@ struct drawing_object_description
     double									anchor_x_;
     double									anchor_y_;
 
+	_CP_OPT(_INT32)							owner_cx_;
+	_CP_OPT(_INT32)							owner_cy_;
+
 	_action_desc							action_;
 	std::vector<_hlink_desc>				hlinks_;
 

ASCOfficeOdfFile/src/docx/headers_footers.h

@@ -38,8 +38,9 @@
 #include "oox_rels.h"
 namespace cpdoccore { 
 
-namespace odf_reader {
-class header_footer_impl;
+namespace odf_reader 
+{
+	class header_footer_impl;
 }
 
 namespace oox {

ASCOfficeOdfFile/src/docx/measuredigits.cpp

@@ -73,7 +73,7 @@ std::pair<float, float> GetMaxDigitSizePixelsImpl(const std::wstring & fontName,
 		//if (FALSE == (hr = pFontManager->LoadString2( std::to_wstring(i), 0, 0)))
 		//	return std::pair<float, float>(7,8);
 
-		if (FALSE == (hr = pFontManager->LoadString2( L"xxxxx" , 0, 0)))
+		if (FALSE == (hr = pFontManager->LoadString2( L"0123456789abcdefghijklmnopqrstuvwxyz" , 0, 0)))
 			return std::pair<float, float>(7,8);
 
 		TBBox box;
@@ -96,7 +96,7 @@ std::pair<float, float> GetMaxDigitSizePixelsImpl(const std::wstring & fontName,
         if (box.fMaxY - box.fMinY < minHeight)  minHeight = box.fMaxY - box.fMinY;
     }
 
-	double width = (minWidth + 2 * maxWidth) /3. /5.;
+	double width = (minWidth + 2 * maxWidth) /36. /3.;
 	return std::pair<float, float>(width, maxHeight);
 }
 

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -101,6 +101,7 @@ 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;
@@ -193,7 +194,14 @@ std::wstring mediaitems::detectImageFileExtension(const std::wstring &fileName)
 		CImageFileFormatChecker image_checker;
 		sExt = image_checker.DetectFormatByData(buffer, buffer_size);
 
-		if (!sExt.empty()) sExt = std::wstring(L".") + sExt;
+		if (sExt.empty())
+		{
+			size_t n = fileName.rfind(L".");
+			if (n != std::wstring::npos) 
+				sExt = XmlUtils::GetLower(fileName.substr(n));
+
+		}
+		else sExt = std::wstring(L".") + sExt;
 	}
 	return XmlUtils::GetLower(sExt);
 }
@@ -329,6 +337,10 @@ void mediaitems::dump_rels(rels & Rels)
 {
     for (size_t i = 0; i < items_.size(); i++)
     {
+		if ( items_[i].type == typeUnknown ) continue; 
+		if ( items_[i].type == typeShape ) continue; 
+		if ( items_[i].type == typeGroupShape ) continue; 
+
 		if (items_[i].count_used >= items_[i].count_add) continue; // уже использовали этот релс выше(колонтитул ....)
         
 		Rels.add( relationship(
@@ -338,7 +350,7 @@ void mediaitems::dump_rels(rels & Rels)
                 items_[i].mediaInternal	? L""					: L"External" )
                 );
 		items_[i].count_used++;
-    }        
+	}        
 }
 
 

ASCOfficeOdfFile/src/docx/mediaitems.h

@@ -123,19 +123,21 @@ public:
 
 		if (sExt == L"wmv") return typeVideo;
 		if (sExt == L"avi") return typeVideo;
-		if (sExt == L"wmv") return typeVideo;
-		if (sExt == L"wma") return typeAudio;
-		if (sExt == L"wav") return typeAudio;
-		
-		if (sExt == L"mp3") return typeAudio;
-		if (sExt == L"m4a") return typeAudio;
 		if (sExt == L"m4v") return typeVideo;
 		if (sExt == L"mp4") return typeVideo;
 		if (sExt == L"mov") return typeVideo;
 		if (sExt == L"mkv") return typeVideo;
+		if (sExt == L"webm") return typeVideo;
+
+		if (sExt == L"wmv") return typeVideo;
+		if (sExt == L"wma") return typeAudio;
+		if (sExt == L"wav") return typeAudio;		
+		if (sExt == L"mp3") return typeAudio;
+		if (sExt == L"m4a") return typeAudio;
 
 		return typeMedia;
 	}
+
 private:
 	std::wstring create_file_name			(const std::wstring & uri, RelsType type, bool & isInternal, size_t Num);
 	std::wstring detectImageFileExtension	(const std::wstring &fileName);
@@ -146,6 +148,7 @@ private:
     NSFonts::IApplicationFonts	*applicationFonts_;
 };
 
+typedef _CP_PTR(mediaitems) mediaitems_ptr;
 }
 }
 

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

@@ -122,6 +122,7 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 	oox_chart_shape			shape;
 	_CP_OPT(bool)			boolVal;
 	_CP_OPT(std::wstring)	strVal;
+	_CP_OPT(double)			doubleVal;
 	
 	oox_title title;
 	title.set_content(content_.title_);//todo нужно задать понармальному layout
@@ -146,7 +147,23 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 					CP_XML_ATTR(L"val", "minMax");//default
 				}
 			}
-			odf_reader::GetProperty(content_.properties_,L"logarithmic",boolVal);
+			odf_reader::GetProperty(content_.properties_,L"maximum", doubleVal);
+			if (doubleVal)
+			{
+				CP_XML_NODE(L"c:max")
+				{
+					CP_XML_ATTR(L"val", *doubleVal);
+				}
+			}
+			odf_reader::GetProperty(content_.properties_,L"minimum", doubleVal);
+			if (doubleVal)
+			{
+				CP_XML_NODE(L"c:min")
+				{
+					CP_XML_ATTR(L"val", *doubleVal);
+				}
+			}
+			odf_reader::GetProperty(content_.properties_,L"logarithmic", boolVal);
 			if ((boolVal == true) && (boolVal.get()==true))
 			{
 				CP_XML_NODE(L"c:logBase")

ASCOfficeOdfFile/src/docx/oox_chart_context.cpp

@@ -53,7 +53,7 @@ public:
     std::wstring drawingId_;
 };
 
-oox_chart_context::oox_chart_context(mediaitems & m, std::wstring name) :
+oox_chart_context::oox_chart_context(mediaitems_ptr & m, std::wstring name) :
 		impl_(new oox_chart_context::Impl( name)), mediaitems_(m)
 {
 	
@@ -65,7 +65,7 @@ void oox_chart_context::reset_fill(oox::_oox_fill &f)
 	{
 		bool isInternal = true;
 		std::wstring ref;
-		f.bitmap->rId = mediaitems_.add_or_find(f.bitmap->xlink_href_, typeImage, isInternal, ref); 
+		f.bitmap->rId = mediaitems_->add_or_find(f.bitmap->xlink_href_, typeImage, isInternal, ref); 
 
 		rels_.push_back(_rel(isInternal, f.bitmap->rId, ref, typeImage));
 	}
@@ -75,9 +75,15 @@ void oox_chart_context::set_externalData(const std::wstring & href)
 	bool isInternal = true;
 	std::wstring href_out;
 	
-	externalDataId_ = mediaitems_.add_or_find(href, typeMsObject, isInternal, href_out);
+	externalDataId_ = mediaitems_->add_or_find(href, typeMsObject, isInternal, href_out);
 	rels_.push_back(_rel(isInternal, externalDataId_, href_out, typeMsObject));
 }
+void oox_chart_context::set_userShapes(std::pair<std::wstring, std::wstring> &link)
+{
+	bool isInternal = true;
+	userShapesId_ = link.second;
+	rels_.push_back(_rel(isInternal, userShapesId_, link.first, typeChartUserShapes));
+}
 std::wostream & oox_chart_context::chartData()
 {
     return impl_->chartData_;
@@ -116,6 +122,15 @@ void oox_chart_context::dump_rels(rels & Rels)
 						(r.is_internal ? L"" : L"External"))
 			);
 		}
+		else if (r.type == typeChartUserShapes)
+		{
+			Rels.add(relationship(
+						r.rid,
+						L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartUserShapes",
+						r.is_internal ? std::wstring(L"../drawings/") + r.ref : r.ref,
+						(r.is_internal ? L"" : L"External"))
+			);			
+		}
 	}
 }
 
@@ -226,6 +241,13 @@ void oox_chart_context::serialize(std::wostream & strm)
 					}
 				}
 			}
+			if (userShapesId_.empty() == false)
+			{
+				CP_XML_NODE(L"c:userShapes")
+				{
+					CP_XML_ATTR(L"r:id", userShapesId_);
+				}
+			}
 		}
 	}
 }

ASCOfficeOdfFile/src/docx/oox_chart_context.h

@@ -53,7 +53,7 @@ typedef _CP_PTR(oox_chart_context) oox_chart_context_ptr;
 class oox_chart_context
 {
 public:
-    oox_chart_context(mediaitems & mediaitems_, std::wstring name);
+    oox_chart_context(mediaitems_ptr & mediaitems_, std::wstring name);
     ~oox_chart_context();
 
 	std::wostream & chartData();
@@ -83,6 +83,8 @@ public:
 		}
 	}
 	void set_externalData(const std::wstring & href);
+	void set_userShapes(std::pair<std::wstring, std::wstring> &link);
+
 	void add_chart(int type)
 	{
 		plot_area_.add_chart(type);
@@ -128,7 +130,7 @@ private:
     class Impl;
     _CP_SCOPED_PTR(Impl) impl_;
 	
-	mediaitems							&mediaitems_;
+	mediaitems_ptr						mediaitems_;
 	std::vector<_rel>					rels_;
 	
 	cpdoccore::oox::oox_title			title_;
@@ -137,6 +139,7 @@ private:
 
 	std::wstring						pivot_source_;
 	std::wstring						externalDataId_;
+	std::wstring						userShapesId_;
 
 	std::vector<odf_reader::_property>	graphic_properties_;
 	_oox_fill							fill_;

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -59,12 +59,19 @@ oox_chart_series::oox_chart_series()
 	bLocalTable_		= false;
 	labelPosEnabled_	= true;
 }
-void oox_chart_series::setName(std::wstring &value)
+void oox_chart_series::setName(const std::wstring &value)
 {
-	name_=value;
+	name_ = value;
 }
+void oox_chart_series::setLabels(const std::wstring &formula, std::vector<std::wstring> & cash)
+{
+	formulasconvert::odf2oox_converter converter;
 
-void oox_chart_series::setFormula(int ind, std::wstring &value, std::wstring & formatCode, bool link_to_source)
+	label_.present	= true;
+	label_.formula = converter.convert_chart_distance(formula);
+	label_.str_cache = cash;
+}
+void oox_chart_series::setFormula(int ind, const std::wstring &value, const std::wstring & formatCode, bool link_to_source)
 {
 	formulasconvert::odf2oox_converter converter;
 
@@ -137,6 +144,7 @@ void oox_chart_series::parse_properties()
 		data_labels_->set_position(*intVal); 
 	}
 }
+
 void oox_chart_series::setValues(int ind, std::vector<std::wstring> & values)
 {
 	values_[ind].present = true;
@@ -215,6 +223,44 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 		shape.set(content_.graphic_properties_, content_.fill_);
 		shape.oox_serialize(_Wostream);
 
+		if (label_.present)
+		{
+			CP_XML_NODE(L"c:tx")
+			{
+				CP_XML_NODE(L"c:strRef")
+				{
+					if (!label_.formula.empty())
+					{
+						CP_XML_NODE(L"c:f")
+						{
+							CP_XML_STREAM() << label_.formula;
+						}
+					}
+					if (false == label_.str_cache.empty())
+					{
+						CP_XML_NODE(L"c:strCache")
+						{
+							CP_XML_NODE(L"c:ptCount")
+							{
+								CP_XML_ATTR(L"val", label_.str_cache.size());
+							}
+							for (size_t i = 0; i < label_.str_cache.size(); i++)
+							{
+								CP_XML_NODE(L"c:pt")
+								{
+									CP_XML_ATTR(L"idx", i);
+									CP_XML_NODE(L"c:v")
+									{
+										CP_XML_STREAM() <<  label_.str_cache[i];
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
 		for (int i = 0; i < 5; i++)
 		{
 			if (values_[i].present)

ASCOfficeOdfFile/src/docx/oox_chart_series.h

@@ -56,17 +56,20 @@ public:
 	virtual void oox_serialize(std::wostream & _Wostream) = 0;
 	
 	bool						labelPosEnabled_;
-	_oox_chart_values			values_[5]; //cat(labels), common, x, y, bubble, 
+	_oox_chart_values			values_[5]; //cat, common, x, y, bubble, 
+
+	_oox_strRef					label_; //tx (Series Text) §21.2.2.215
 	int							id_;
-	std::wstring				name_;	//tx (Series Text) §21.2.2.215
+	std::wstring				name_;	
 	int							iSymbolMarkerType_;
 	bool						bLocalTable_;
 	_CP_OPT(oox_data_labels)	data_labels_;
 	
-	void setName(std::wstring &value);
+	void setName(const std::wstring &value);
 	
-	void setFormula	(int ind, std::wstring & value, std::wstring & formatCode, bool link_to_source);
+	void setFormula	(int ind, const std::wstring & value, const std::wstring & formatCode, bool link_to_source);
 	void setValues	(int ind, std::vector<std::wstring> & values);
+	void setLabels	(const std::wstring &formula, std::vector<std::wstring> & values);
 	void parse_properties();
 	
 	void set_cache_only (bool val);

ASCOfficeOdfFile/src/docx/oox_chart_values.h

@@ -55,21 +55,21 @@ struct _oox_numLit
 
 struct _oox_strRef
 {
-	bool						present;
+	bool						present = false;
 
 	std::wstring				formula;
-	int							str_cache_count;
+	int							str_cache_count = 0;
 	std::vector<std::wstring>	str_cache;
 
 };
 struct _oox_numRef
 {
-	bool						present;
+	bool						present = false;
 
 	std::wstring				formula;
 	std::wstring				formatCode;
-	bool						link_to_source;
-	int							num_cache_count;
+	bool						link_to_source = false;
+	int							num_cache_count = 0;
 	std::vector<std::wstring>	num_cache;
 
 };

ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp

@@ -99,17 +99,23 @@ void tabs_context::reset()
 		odf_reader::style_tab_stop *tab_stop = dynamic_cast<odf_reader::style_tab_stop*>(tabs[i].get());
 		if (tab_stop)
 		{
-			clear_tabs.insert(std::make_pair(tab_stop->style_position_.get_value(), tabs[i]));
+			double pos = tab_stop->margin_left + tab_stop->style_position_.get_value_unit(odf_types::length::pt);
+			
+			clear_tabs.insert(std::make_pair((int)pos, tabs[i]));
 		}
 	}
 	tabs.clear();
 }
-void tabs_context::add(const odf_reader::office_element_ptr & element)
+void tabs_context::add(const odf_reader::office_element_ptr & element, double margin_left)
 {
 	odf_reader::style_tab_stop *tab_stop = dynamic_cast<odf_reader::style_tab_stop*>(element.get());
 	if (tab_stop)
 	{
-		std::map<double, odf_reader::office_element_ptr>::iterator pFind = clear_tabs.find(tab_stop->style_position_.get_value());
+		tab_stop->margin_left = margin_left;
+		
+		double pos = margin_left + tab_stop->style_position_.get_value_unit(odf_types::length::pt);
+
+		std::map<int, odf_reader::office_element_ptr>::iterator pFind = clear_tabs.find((int)pos);
 
 		if (pFind != clear_tabs.end())
 		{
@@ -126,7 +132,7 @@ void tabs_context::docx_convert(oox::docx_conversion_context & Context)
  
     _pPr << L"<w:tabs>";
 
-		for (std::map<double, odf_reader::office_element_ptr>::iterator it = clear_tabs.begin(); it != clear_tabs.end(); ++it)
+		for (std::map<int, odf_reader::office_element_ptr>::iterator it = clear_tabs.begin(); it != clear_tabs.end(); ++it)
 		{
 			odf_reader::style_tab_stop * tab_stop = dynamic_cast<odf_reader::style_tab_stop*>(it->second.get());
 			tab_stop->docx_convert(Context, true);				

ASCOfficeOdfFile/src/docx/oox_conversion_context.h

@@ -110,7 +110,7 @@ class tabs_context : boost::noncopyable
 public:
 
 	std::vector<odf_reader::office_element_ptr> tabs;
-	std::map<double, odf_reader::office_element_ptr> clear_tabs;
+	std::map<int, odf_reader::office_element_ptr> clear_tabs;
 
 	void clear()
 	{
@@ -120,7 +120,7 @@ public:
 
 	void reset();
 
-	void add(const odf_reader::office_element_ptr & element);
+	void add(const odf_reader::office_element_ptr & element, double margin_left);
 	void docx_convert(oox::docx_conversion_context & Context);
 };
 class styles_context : boost::noncopyable

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

@@ -131,6 +131,76 @@ static const std::wstring _ooxDashStyle[]=
 	L"dashDot",
 	L"sysDashDotDot"
 };
+static const std::wstring _vmlDashStyle[]=
+{
+	L"none",
+	L"solid",
+	L"dot",
+	L"dash",
+	L"dash",
+	L"dashdot",
+	L"shortdashdotdot"
+};
+
+void oox_serialize_effects(std::wostream & strm, const std::vector<odf_reader::_property> & prop)
+{
+	_CP_OPT(bool)			bShadow;
+	_CP_OPT(std::wstring)	strShadowColor; 
+	_CP_OPT(double)			dShadowOpacity; 
+	_CP_OPT(double)			dShadowOffsetX; 
+	_CP_OPT(double)			dShadowOffsetY; 
+
+	odf_reader::GetProperty(prop, L"shadow", bShadow);	
+	odf_reader::GetProperty(prop, L"shadow-color", strShadowColor);	
+	odf_reader::GetProperty(prop, L"shadow-opacity", dShadowOpacity);
+	odf_reader::GetProperty(prop, L"shadow-offset-x",	dShadowOffsetX);	
+	odf_reader::GetProperty(prop, L"shadow-offset-y", dShadowOffsetY);
+
+	CP_XML_WRITER(strm)
+    {
+        CP_XML_NODE(L"a:effectLst")
+        { 
+			if ((bShadow) && (*bShadow))
+			{
+				CP_XML_NODE(L"a:outerShdw")
+				{ 			
+					//CP_XML_ATTR(L"blurRad", 0); 
+
+					double offsetX = dShadowOffsetX.get_value_or(0);
+					double offsetY = dShadowOffsetY.get_value_or(0);
+
+					double dist = sqrt(offsetX * offsetX + offsetY * offsetY);
+					double dir = (offsetX > 0 ? atan(offsetY / offsetX) : 0) * 180. / 3.1415926;
+
+					CP_XML_ATTR(L"dist", (int)(dist)); 
+					CP_XML_ATTR(L"dir", (int)(dir * 60000)); 
+					
+					CP_XML_ATTR(L"rotWithShape", L"0"); 
+					CP_XML_ATTR(L"algn", L"tl"); 
+
+					CP_XML_NODE(L"a:srgbClr")
+					{
+						if (strShadowColor)
+						{
+							CP_XML_ATTR(L"val", *strShadowColor); 
+						}
+						else
+						{
+							CP_XML_ATTR(L"val", L"000000"); 
+						}
+						if (dShadowOpacity)
+						{
+							CP_XML_NODE(L"a:alpha")
+							{
+								CP_XML_ATTR(L"val", *dShadowOpacity * 1000); 
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
 
 void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_property> & prop, bool always_draw, const std::wstring &ns)
 {
@@ -152,7 +222,7 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
 	odf_reader::GetProperty(prop, L"stroke"			, iStroke);	
 	odf_reader::GetProperty(prop, L"stroke-width"	, dStrokeWidth);
 	odf_reader::GetProperty(prop, L"stroke-opacity"	, dStrokeOpacity);
-
+	
 	if ((!strStrokeColor && !iStroke && !dStrokeWidth) && !always_draw)return;
 
 	CP_XML_WRITER(strm)
@@ -190,7 +260,7 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
 					
 					CP_XML_NODE(ns + L":srgbClr")
 					{
-						CP_XML_ATTR2(ns_att + L"val",color);
+						CP_XML_ATTR2(ns_att + L"val", color);
 						
 						if (dStrokeOpacity)	
 						{
@@ -224,6 +294,102 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
 		}
     }
 }
+void vml_serialize_text(std::wostream & strm, const std::vector<odf_reader::_property> & prop)
+{
+	_CP_OPT(std::wstring) strTextContent;
+	odf_reader::GetProperty(prop, L"text-content", strTextContent);
+
+	CP_XML_WRITER(strm)
+	{			
+		if (strTextContent)
+		{
+			CP_XML_NODE(L"v:textbox")
+			{  
+				CP_XML_ATTR(L"style", L"mso-direction-alt:auto");
+				CP_XML_ATTR(L"o:singleclick", L"f");
+				
+				CP_XML_NODE(L"div")
+				{
+					CP_XML_ATTR(L"style", L"text-align:left");
+
+					CP_XML_NODE(L"font")
+					{
+						CP_XML_ATTR(L"face", L"Segoe UI");
+						CP_XML_ATTR(L"size", L"160");
+						CP_XML_ATTR(L"color", L"#000000");
+
+						const std::wstring & test_string = strTextContent.get();
+						CP_XML_STREAM() << test_string;
+					}
+				}
+			}
+		}
+	}	
+
+}
+void vml_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_property> & prop)
+{
+	_CP_OPT(std::wstring)	strStrokeColor; 
+	_CP_OPT(int)			iStroke;
+	_CP_OPT(double)			dStrokeWidth;
+	_CP_OPT(double)			dStrokeOpacity; 
+	_CP_OPT(bool)			bWordArt;
+	
+	odf_reader::GetProperty(prop, L"wordArt", bWordArt);
+	
+	odf_reader::GetProperty(prop, L"stroke-color"	, strStrokeColor);	
+	odf_reader::GetProperty(prop, L"stroke"			, iStroke);	
+	odf_reader::GetProperty(prop, L"stroke-width"	, dStrokeWidth);
+	odf_reader::GetProperty(prop, L"stroke-opacity"	, dStrokeOpacity);
+
+	if (!strStrokeColor && !iStroke && !dStrokeWidth) return;
+
+	CP_XML_WRITER(strm)
+    {
+        CP_XML_NODE(L"v:stroke")
+        { 
+			std::wstring color, dash_style ;
+
+			if (strStrokeColor) color = *strStrokeColor;
+
+			if (iStroke)
+			{
+				if (iStroke.get() != 0 ) dash_style = _vmlDashStyle[iStroke.get()];	
+			}
+			
+			if ((dStrokeWidth) && (*dStrokeWidth >= 0))
+			{
+				int val = dStrokeWidth.get() * 12700;	//in emu (1 pt = 12700)
+				if (val < 10)	val = 12700;
+				
+				CP_XML_ATTR(L"weight", val);
+			}
+
+			if (false == color.empty())
+			{
+				CP_XML_ATTR(L"color", L"#" + color);
+			}
+			if (!dash_style.empty() && dash_style != L"solid")
+			{
+				CP_XML_ATTR(L"dashstyle", dash_style);
+			}
+			//odf_reader::GetProperty(prop,L"marker-start", strVal);	
+			//if (strVal)
+			//{
+			//}
+			//odf_reader::GetProperty(prop,L"marker-end",strVal);	
+			//if (strVal)
+			//{
+			//}
+
+			CP_XML_ATTR(L"startarrow", L"block"); 
+			CP_XML_ATTR(L"startarrowwidth", L"medium");  
+			CP_XML_ATTR(L"startarrowlength", L"medium"); 
+			CP_XML_ATTR(L"joinstyle", L"round");  
+			CP_XML_ATTR(L"endcap", L"flat"); 
+		}
+    }
+}
 void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_property> & prop, const std::wstring & shapeGeomPreset, const std::wstring &ns)
 {
 	std::wstring ns_att = (ns == L"a" ? L"" : ns + L":");
@@ -377,8 +543,7 @@ void _oox_drawing::serialize_bodyPr(std::wostream & strm, const std::wstring & n
 			}
 			else if ((bFitToSize) && (*bFitToSize))
 			{
-				CP_XML_NODE(L"a:noAutofit");
-				//CP_XML_NODE(L"a:spAutoFit")
+				CP_XML_NODE(L"a:normAutofit");
 				//{
 				//	CP_XML_ATTR(L"lnSpcReduction", 10000);
 				//}

ASCOfficeOdfFile/src/docx/oox_drawing.h

@@ -83,7 +83,7 @@ namespace oox {
 	class _oox_drawing
     {
 	public:
-        _oox_drawing() : type(typeUnknown), id(0), x(0), y(0), cx(0), cy(0), sub_type(0), inGroup(false), lined(false), connector(false), name(L"object"), extExternal(false)
+        _oox_drawing() : type(typeUnknown), id(0), x(0), y(0), cx(0), cy(0), sub_type(0), hidden(false), inGroup(false), lined(false), connector(false), name(L"object"), extExternal(false)
         {
         }
         RelsType		type;
@@ -92,6 +92,7 @@ namespace oox {
 		size_t			id;
 		bool			lined;
 		bool			connector;
+		bool			hidden;
 
         std::wstring	name;
         int				sub_type; //odf
@@ -123,7 +124,10 @@ namespace oox {
 	void oox_serialize_ln		(std::wostream & strm, const std::vector<odf_reader::_property> & val, bool always_draw = false, const std::wstring &ns = L"a");
 	void oox_serialize_aLst		(std::wostream & strm, const std::vector<odf_reader::_property> & val, const std::wstring & shapeGeomPreset, const std::wstring &ns = L"a");
     void oox_serialize_action	(std::wostream & strm, const _action_desc & val);
+	void oox_serialize_effects	(std::wostream & strm, const std::vector<odf_reader::_property> & val);
     
+	void vml_serialize_ln		(std::wostream & strm, const std::vector<odf_reader::_property> & val);
+	void vml_serialize_text		(std::wostream & strm, const std::vector<odf_reader::_property> & val);
 }
 }
 

ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp

@@ -245,7 +245,7 @@ void vml_serialize_gradient_fill(std::wostream & strm, const _oox_fill & val)
 		{
 			if (!val.gradient->colors.empty())
 			{
-				CP_XML_ATTR(L"color2", val.gradient->colors[val.gradient->colors.size() - 1].color_ref);
+				CP_XML_ATTR(L"color2", L"#" + val.gradient->colors[val.gradient->colors.size() - 1].color_ref);
 
 				std::wstring colors_value;
 				for (size_t i = 0; i < val.gradient->colors.size(); i++)
@@ -404,6 +404,27 @@ void vml_serialize_background (std::wostream & strm, const _oox_fill & val, cons
 	}
 }
 
+void vml_serialize_fill (std::wostream & strm, const _oox_fill & val)
+{
+	switch (val.type)
+	{
+		case 0:	
+			break;
+		case 1:	
+			vml_serialize_solid_fill(strm, val);
+			break;
+		case 2:	
+			vml_serialize_bitmap_fill(strm, val);
+			break;
+		case 3:	
+			vml_serialize_gradient_fill(strm, val);
+			break;
+		case 4:	
+			//vml_serialize_hatch_fill(strm, val);
+			break;			
+	}
+}
+
 void oox_serialize_fill (std::wostream & strm, const _oox_fill & val, const std::wstring &ns)
 {
 	switch (val.type)

ASCOfficeOdfFile/src/docx/oox_drawing_fills.h

@@ -154,5 +154,6 @@ namespace oox {
 	void oox_serialize_bitmap_fill	(std::wostream & strm, const _oox_fill & val, const std::wstring &ns = L"a");
 	
     void oox_serialize_fill			(std::wostream & strm, const _oox_fill & val, const std::wstring &ns = L"a");
+    void vml_serialize_fill			(std::wostream & strm, const _oox_fill & val);
 }
 }

ASCOfficeOdfFile/src/docx/oox_package.cpp

@@ -75,6 +75,7 @@ static std::wstring get_mime_type(const std::wstring & extension)
  	else if (L"tiff" == extension)	return  L"image/x-tiff";
 	else if (L"pdf" == extension)	return  L"application/pdf";
 	else if (L"bmp" == extension)	return  L"image/bmp";
+	else if (L"wdp" == extension)	return  L"image/vnd.ms-photo";
 
 	else if (L"wav" == extension)	return  L"audio/wav";
 	else if (L"mp3" == extension)	return  L"audio/mpeg";
@@ -172,6 +173,26 @@ bool content_types_file::add_or_find_override(const std::wstring & fileName)
 
 	return true;
 }
+void content_types_file::set_media(mediaitems_ptr & _Mediaitems)
+{
+	std::vector<mediaitems::item> & items_ = _Mediaitems->items();
+    for (size_t i = 0; i < items_.size(); i++)
+    {
+		if ((items_[i].type == typeImage || 
+			items_[i].type == typeMedia	||
+			items_[i].type == typeVideo	||
+			items_[i].type == typeAudio) && items_[i].mediaInternal)
+		{
+			int n = items_[i].outputName.rfind(L".");
+			if (n > 0)
+			{
+				add_or_find_default(items_[i].outputName.substr(n + 1, items_[i].outputName.length() - n));
+			}
+		}
+	}
+}
+
+
 
 void content_types_file::set_media(mediaitems & _Mediaitems)
 {
@@ -348,7 +369,7 @@ void docProps_files::write(const std::wstring & RootPath)
 ////////////
 
 
-media::media(mediaitems & _Mediaitems, NSFonts::IApplicationFonts *pAppFonts) : mediaitems_(_Mediaitems), appFonts_(pAppFonts)
+media::media(mediaitems_ptr & _mediaitems, NSFonts::IApplicationFonts *pAppFonts) : mediaItems_(_mediaitems), appFonts_(pAppFonts)
 {    
 }
 
@@ -357,7 +378,8 @@ void media::write(const std::wstring & RootPath)
     std::wstring path = RootPath + FILE_SEPARATOR_STR + L"media";
     NSDirectory::CreateDirectory(path.c_str());
 
-	mediaitems::items_array & items = mediaitems_.items();
+	mediaitems::items_array & items = mediaItems_->items();
+
     for (size_t i = 0; i < items.size(); i++ )
     {
         if (items[i].mediaInternal && items[i].valid && (	items[i].type == typeImage || 
@@ -380,7 +402,7 @@ void media::write(const std::wstring & RootPath)
 
 }
 //------------------------------------------------------------------------------------------------------------
-charts::charts(mediaitems & _ChartsItems) : chartsitems_(_ChartsItems)
+charts::charts(mediaitems_ptr & _chartsItems) : chartsItems_(_chartsItems)
 {    
 }
 
@@ -389,7 +411,7 @@ void charts::write(const std::wstring & RootPath)
 
 }
 //--------------------------------------------------------------------------------------------------------------
-embeddings::embeddings(mediaitems & _EmbeddingsItems) : embeddingsitems_(_EmbeddingsItems)
+embeddings::embeddings(mediaitems_ptr & _EmbeddingsItems) : embeddingsItems_(_EmbeddingsItems)
 {    
 }
 void embeddings::write(const std::wstring & RootPath)
@@ -399,7 +421,8 @@ void embeddings::write(const std::wstring & RootPath)
 
 	content_types_file & content_types = get_main_document()->get_content_types_file();           
     
-	mediaitems::items_array & items = embeddingsitems_.items();
+	mediaitems::items_array & items = embeddingsItems_->items();
+
     for (size_t i = 0; i < items.size(); i++ )
     {
         if ( items[i].mediaInternal && items[i].valid &&

ASCOfficeOdfFile/src/docx/oox_package.h

@@ -51,6 +51,7 @@ namespace cpdoccore {
 namespace oox {
 
 class mediaitems;
+typedef _CP_PTR(mediaitems) mediaitems_ptr;
 
 namespace package {
 
@@ -81,16 +82,17 @@ inline element::~element()
 class content_types_file : public element
 {
 public:
-							content_types_file	();
-	void					write				(const std::wstring & RootPath);
-	bool					add_or_find_default	(const std::wstring & extension);
-	bool					add_or_find_override(const std::wstring & fileName);
-	void					set_media			(mediaitems & _Mediaitems);
-    content_type *	content				();
+					content_types_file	();
+	void			write				(const std::wstring & RootPath);
+	bool			add_or_find_default	(const std::wstring & extension);
+	bool			add_or_find_override(const std::wstring & fileName);
+	void			set_media			(mediaitems & _Mediaitems);
+	void			set_media			(mediaitems_ptr & _Mediaitems);
+    content_type*	content				();
 
 private:
     content_type	content_type_content_;
-    std::wstring			filename_;
+    std::wstring	filename_;
 };
 
 class simple_element;
@@ -189,8 +191,8 @@ public:
     std::wstring str() { return content_.str(); }
     static _CP_PTR(chart_content) create();
 private:
-    std::wstringstream content_;
-    rels_file_ptr rels_;
+    std::wstringstream	content_;
+    rels_file_ptr		rels_;
 };
 //------------------------------------------------------------------------
 class document : public element
@@ -228,39 +230,39 @@ private:
 class media : public element
 {
 public:
-    media(mediaitems & _Mediaitems, NSFonts::IApplicationFonts *pAppFonts);
+    media(mediaitems_ptr & _mediaItems, NSFonts::IApplicationFonts *pAppFonts);
 
 public:
     virtual void write(const std::wstring & RootPath);
 
 private:
-    mediaitems			& mediaitems_;
-    NSFonts::IApplicationFonts	* appFonts_;
+    mediaitems_ptr				mediaItems_;
+    NSFonts::IApplicationFonts* appFonts_;
         
 };
 
 class charts : public element
 {
 public:
-    charts(mediaitems & _ChartsItems);
+    charts(mediaitems_ptr & _chartsItems);
 
 public:
     virtual void write(const std::wstring & RootPath);
 
 private:
-    mediaitems & chartsitems_;
+    mediaitems_ptr chartsItems_;
         
 };
 class embeddings : public element
 {
 public:
-    embeddings(mediaitems & _EmbeddingsItems);
+    embeddings(mediaitems_ptr & _embeddingsItems);
 
 public:
     virtual void write(const std::wstring & RootPath);
 
 private:
-    mediaitems & embeddingsitems_;
+    mediaitems_ptr  embeddingsItems_;
         
 };
 } // namespace package

ASCOfficeOdfFile/src/docx/oox_rels.h

@@ -43,6 +43,7 @@ namespace oox {
 enum RelsType 
 {
 	typeUnknown = 0, 
+	typeDefault,
 	typeImage, 
 	typeChart, 
 	typeShape, 
@@ -59,7 +60,8 @@ enum RelsType
 	typeExternalLink, 
 	typeActiveX, 
 	typeControl,
-	typeControlProps
+	typeControlProps,
+	typeChartUserShapes
 };
 
 struct _rel
@@ -71,10 +73,10 @@ struct _rel
 			type(type_)
 		{}
 
-    bool				is_internal;
-    std::wstring		rid;
-    std::wstring		ref;
-    RelsType	type;
+    bool			is_internal;
+    std::wstring	rid;
+    std::wstring	ref;
+    RelsType		type;
 };
 
 class relationship : public xml::element_impl<relationship>

ASCOfficeOdfFile/src/docx/oox_types_chart.cpp

@@ -46,13 +46,13 @@ void oox_chart::set_cache_only (bool val)
 
 }
 
-void oox_chart::set_formula_series(int ind, std::wstring val, std::wstring formatCode, bool link_to_source)
+void oox_chart::set_formula_series(int ind, const std::wstring& val, const std::wstring& formatCode, bool link_to_source)
 {
 	oox_series_ptr & current_ptr = series_.back();
 	current_ptr->setFormula(ind, val, formatCode, link_to_source);
 
 }
-void oox_chart::set_name(std::wstring val)
+void oox_chart::set_name(const std::wstring& val)
 {
 	oox_series_ptr & current_ptr = series_.back();
 	current_ptr->setName(val);
@@ -68,6 +68,13 @@ void oox_chart::set_values_series(int ind, std::vector<std::wstring> & val)
 	oox_series_ptr & current_ptr = series_.back();
 	current_ptr->setValues (ind, val);
 }
+void oox_chart::set_label_series(const std::wstring& formula, std::vector<std::wstring> & cash)
+{
+	if (formula.empty() && cash.empty()) return;
+
+	oox_series_ptr & current_ptr = series_.back();
+	current_ptr->setLabels (formula, cash);
+}
 void oox_chart::set_properties(std::vector<odf_reader::_property> g)
 {
 	_CP_OPT(int) iVal;

ASCOfficeOdfFile/src/docx/oox_types_chart.h

@@ -78,9 +78,10 @@ public:
 	virtual void add_series(int id){}
 	
 	void set_cache_only		(bool val);
-	void set_formula_series	(int ind, std::wstring val, std::wstring formatCode, bool link_to_source);
+	void set_formula_series	(int ind, const std::wstring& val, const std::wstring& formatCode, bool link_to_source);
 	void set_values_series	(int ind, std::vector<std::wstring> & val);
-	void set_name			(std::wstring val);
+	void set_label_series	(const std::wstring& formula, std::vector<std::wstring> & val);
+	void set_name			(const std::wstring& val);
 	void set_content_series	(odf_reader::chart::series & content);
 	
 	//void set_showBubbleSize(bool Val){data_labels_.set_showBubbleSize(Val);}

ASCOfficeOdfFile/src/docx/pptx_comments_context.cpp

@@ -51,7 +51,7 @@ public:
     {
     }  
 
-    std::pair<std::wstring, std::wstring> add_comments_xml(std::wstring const & content,pptx_comments_ptr comments)
+    std::pair<std::wstring, std::wstring> add_comments_xml(std::wstring const & content, pptx_comments_ptr comments)
     {
  		const std::wstring file_id = std::to_wstring(next_file_id_++);
       

ASCOfficeOdfFile/src/docx/pptx_conversion_context.cpp

@@ -83,7 +83,7 @@ void pptx_conversion_context::set_output_document(package::pptx_document * docum
 
 void pptx_conversion_context::set_font_directory(std::wstring pathFonts)
 {
-	pptx_slide_context_.get_mediaitems().set_font_directory(pathFonts);
+	pptx_slide_context_.get_mediaitems()->set_font_directory(pathFonts);
 }
 
 void pptx_conversion_context::process_layouts()

ASCOfficeOdfFile/src/docx/pptx_conversion_context.h

@@ -133,7 +133,7 @@ public:
 
 	pptx_table_context	& get_table_context()	{ return pptx_table_context_; }
 
-    mediaitems & get_mediaitems() { return pptx_slide_context_.get_mediaitems(); }
+    mediaitems_ptr & get_mediaitems() { return pptx_slide_context_.get_mediaitems(); }
 
     //void start_hyperlink(const std::wstring & styleName);
     //void end_hyperlink(std::wstring const & href);

ASCOfficeOdfFile/src/docx/pptx_drawing.cpp

@@ -101,6 +101,7 @@ void pptx_serialize_image(std::wostream & strm, _pptx_drawing & val)
                     CP_XML_NODE(L"a:avLst");
                 }
 				oox_serialize_ln(CP_XML_STREAM(), val.additional);
+				oox_serialize_effects(CP_XML_STREAM(), val.additional);
             } 			
 			//_CP_OPT(std::wstring) strTextContent;
 			//odf::GetProperty(properties,L"text-content",strTextContent);
@@ -186,7 +187,8 @@ void pptx_serialize_media(std::wostream & strm, _pptx_drawing & val)
                 }
 				oox_serialize_fill	(CP_XML_STREAM(), val.fill);
 				oox_serialize_ln	(CP_XML_STREAM(), val.additional);
-            } 			
+ 				oox_serialize_effects(CP_XML_STREAM(), val.additional);
+           } 			
 			//_CP_OPT(std::wstring) strTextContent;
 			//odf::GetProperty(properties,L"text-content",strTextContent);
 			//pptx_serialize_text(CP_XML_STREAM(),val.additional);
@@ -248,6 +250,7 @@ void pptx_serialize_shape(std::wostream & strm, _pptx_drawing & val)
 					val.serialize_shape(CP_XML_STREAM());
 
 					oox_serialize_ln(CP_XML_STREAM(), val.additional);
+					oox_serialize_effects(CP_XML_STREAM(), val.additional);
 				}
 			}
 			 pptx_serialize_text(CP_XML_STREAM(), val);
@@ -307,6 +310,7 @@ void pptx_serialize_connector(std::wostream & strm, _pptx_drawing & val)
 					val.serialize_shape(CP_XML_STREAM());
 
 					oox_serialize_ln(CP_XML_STREAM(), val.additional);
+					oox_serialize_effects(CP_XML_STREAM(), val.additional);
 				}
 			}
 			 pptx_serialize_text(CP_XML_STREAM(), val);

ASCOfficeOdfFile/src/docx/pptx_package.cpp

@@ -509,15 +509,15 @@ void ppt_files::add_notesMaster(slide_content_ptr slide)
 {
     notesMaster_files_.add_slide(slide);
 }
-void ppt_files::set_media(mediaitems & _Mediaitems)
+void ppt_files::set_media(mediaitems_ptr & _mediaitems)
 {
-	if (_Mediaitems.count_image + _Mediaitems.count_media > 0)
+	if (_mediaitems->count_image + _mediaitems->count_media > 0)
 	{
-		media_ = element_ptr( new media(_Mediaitems, _Mediaitems.applicationFonts()) );
+		media_ = element_ptr( new media(_mediaitems, _mediaitems->applicationFonts()) );
 	}
-	if (_Mediaitems.count_object > 0)
+	if (_mediaitems->count_object > 0)
 	{
-		embeddings_ = element_ptr( new embeddings(_Mediaitems) );
+		embeddings_ = element_ptr( new embeddings(_mediaitems) );
 	}
 }
 void ppt_files::set_authors_comments(pptx_xml_authors_comments_ptr & authors_comments)

ASCOfficeOdfFile/src/docx/pptx_package.h

@@ -217,7 +217,7 @@ public:
 	void add_notes		(slide_content_ptr sheet);
 	void add_notesMaster(slide_content_ptr sheet);
 	
-    void set_media(mediaitems & _Mediaitems);
+    void set_media(mediaitems_ptr & _mediaitems);
     void add_charts(chart_content_ptr chart);
     void add_theme (pptx_xml_theme_ptr theme);
 

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

@@ -65,8 +65,10 @@ public:
 		bool					onClick;
 	};
 
-	Impl(const std::wstring & odfPacket) : mediaitems_(odfPacket), odfPacket_(odfPacket)
+	Impl(const std::wstring & _odfPacket) : odfPacket_(_odfPacket)
     {
+		mediaitems_ = boost::make_shared<mediaitems>(odfPacket_);
+
 		clear();
 	}
 
@@ -88,7 +90,7 @@ public:
     {
         pptx_drawings_->add(isInternal, rid, ref, type);
     }
-	mediaitems & get_mediaitems() { return mediaitems_; }
+	mediaitems_ptr & get_mediaitems() { return mediaitems_; }
 
     bool empty() const
     {
@@ -138,7 +140,7 @@ private:
 	void process_media	(drawing_object_description& obj, _pptx_drawing & drawing);
 	
 	size_t				rId_;
-	mediaitems			mediaitems_;
+	mediaitems_ptr		mediaitems_;
     pptx_drawings_ptr	pptx_drawings_;
     pptx_drawings_ptr	pptx_notes_drawings_;
 };
@@ -357,7 +359,7 @@ void pptx_slide_context::add_background(_oox_fill & fill)
 		bool isMediaInternal = false;
 		std::wstring ref;
 		
-		fill.bitmap->rId = get_mediaitems().add_or_find(fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref);
+		fill.bitmap->rId = get_mediaitems()->add_or_find(fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref);
 		add_rels(isMediaInternal, fill.bitmap->rId, ref, typeImage);
 	}	
 	impl_->background_fill_ = fill;
@@ -421,7 +423,7 @@ void pptx_slide_context::set_link(std::wstring link, RelsType typeRels)
 	{
 		bool isMediaInternal = true;
 		
-		impl_->object_description_.action_.hSoundId = get_mediaitems().add_or_find(link, typeAudio, isMediaInternal, impl_->object_description_.action_.hSoundRef);		
+		impl_->object_description_.action_.hSoundId = get_mediaitems()->add_or_find(link, typeAudio, isMediaInternal, impl_->object_description_.action_.hSoundRef);		
 		impl_->add_additional_rels(isMediaInternal, impl_->object_description_.action_.hSoundId, impl_->object_description_.action_.hSoundRef, typeAudio);
 	}
 	else
@@ -493,6 +495,10 @@ void pptx_slide_context::set_image(const std::wstring & path)
 		impl_->object_description_.type_		= typeImage;	
 		impl_->object_description_.xlink_href_	= path; 
 	}
+	else if (impl_->object_description_.type_ == typeImage && impl_->object_description_.xlink_href_.rfind(L".svg") != std::wstring::npos)
+	{
+		impl_->object_description_.xlink_href_	= path; 
+	}
 	else if (impl_->use_image_replacement_)
 	{
 		impl_->object_description_.fill_.type = 2;
@@ -562,7 +568,7 @@ void pptx_slide_context::Impl::process_image(drawing_object_description& obj, _p
 	}
 
 	std::wstring fileName = odfPacket_ + FILE_SEPARATOR_STR + obj.xlink_href_;			
-	drawing.fill.bitmap->bCrop  = odf_reader::parse_clipping(obj.clipping_string_, fileName, drawing.fill.bitmap->cropRect, get_mediaitems().applicationFonts());
+	drawing.fill.bitmap->bCrop  = odf_reader::parse_clipping(obj.clipping_string_, fileName, drawing.fill.bitmap->cropRect, get_mediaitems()->applicationFonts());
 	drawing.fill.bitmap->bStretch = true;
 	
 	if ((sColorMode) && (*sColorMode == L"greyscale"))
@@ -572,7 +578,7 @@ void pptx_slide_context::Impl::process_image(drawing_object_description& obj, _p
 	std::wstring ref;/// это ссылка на выходной внешний объект
 	bool isMediaInternal = false;
 	
-	drawing.fill.bitmap->rId		= get_mediaitems().add_or_find(obj.xlink_href_, typeImage, isMediaInternal, ref);
+	drawing.fill.bitmap->rId		= get_mediaitems()->add_or_find(obj.xlink_href_, typeImage, isMediaInternal, ref);
 	drawing.fill.bitmap->isInternal	= isMediaInternal;
 
 	if (drawing.type == typeShape)
@@ -580,7 +586,7 @@ void pptx_slide_context::Impl::process_image(drawing_object_description& obj, _p
 		add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);//собственно это не объект, а доп рел и ref объекта
 	
 		isMediaInternal	= true;
-		std::wstring rId = get_mediaitems().add_or_find(L"", typeShape, isMediaInternal, ref);
+		std::wstring rId = get_mediaitems()->add_or_find(L"", typeShape, isMediaInternal, ref);
 		
 		add_drawing(drawing, isMediaInternal, rId, ref, typeShape);//объект
 
@@ -595,7 +601,7 @@ void pptx_slide_context::Impl::process_chart(drawing_object_description & obj, _
     std::wstring ref;
     bool isMediaInternal = true;
    
-	drawing.objectId = get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);  
+	drawing.objectId = get_mediaitems()->add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);  
 	
 	add_drawing(drawing, isMediaInternal, drawing.objectId, ref, drawing.type);
 }
@@ -604,7 +610,7 @@ void pptx_slide_context::Impl::process_table(drawing_object_description & obj, _
 {
     std::wstring ref;
     bool isMediaInternal = true;
-	std::wstring rId = get_mediaitems().add_or_find(L"", obj.type_, isMediaInternal, ref);        
+	std::wstring rId = get_mediaitems()->add_or_find(L"", obj.type_, isMediaInternal, ref);        
    
 	add_drawing(drawing, isMediaInternal, rId, ref, drawing.type);
 
@@ -619,12 +625,12 @@ void pptx_slide_context::Impl::process_shape(drawing_object_description & obj, _
 	
 	if (drawing.fill.bitmap)
 	{
-		drawing.fill.bitmap->rId = get_mediaitems().add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref);
+		drawing.fill.bitmap->rId = get_mediaitems()->add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref);
 		
 		add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);
 	}
 		
-	std::wstring rId = get_mediaitems().add_or_find(L"", typeShape, isMediaInternal, ref);
+	std::wstring rId = get_mediaitems()->add_or_find(L"", typeShape, isMediaInternal, ref);
    
 ////////////////////////////////////////////////////////////////
 	_CP_OPT(std::wstring) sPlaceHolderType;
@@ -647,7 +653,7 @@ void pptx_slide_context::Impl::process_object(drawing_object_description& obj, _
     std::wstring ref, ref_image;
     bool isMediaInternal = true, isMediaInternal_image = true;
    
-	drawing.objectId		= get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);      
+	drawing.objectId		= get_mediaitems()->add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);      
 	drawing.objectProgId	= obj.descriptor_;
 
 	if (!drawing.fill.bitmap)
@@ -658,7 +664,7 @@ void pptx_slide_context::Impl::process_object(drawing_object_description& obj, _
 		_image_file_::GenerateZeroImage(odfPacket_ + FILE_SEPARATOR_STR + L"zero.png");
 	}
 	
-	drawing.fill.bitmap->rId = get_mediaitems().add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal_image, ref_image);
+	drawing.fill.bitmap->rId = get_mediaitems()->add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal_image, ref_image);
 	add_additional_rels(isMediaInternal_image, drawing.fill.bitmap->rId, ref_image, typeImage);
 
 	add_drawing(drawing, isMediaInternal, drawing.objectId, ref, drawing.type);	
@@ -670,7 +676,7 @@ void pptx_slide_context::Impl::process_media(drawing_object_description& obj, _p
 
 	drawing.type = mediaitems::detectMediaType(obj.xlink_href_); //reset from Media to Audio, Video, ... QuickTime? AudioCD? ...   
 	
-	drawing.objectId	= get_mediaitems().add_or_find(obj.xlink_href_, drawing.type, isMediaInternal, ref);    
+	drawing.objectId	= get_mediaitems()->add_or_find(obj.xlink_href_, drawing.type, isMediaInternal, ref);    
 	drawing.extId		= L"ext" + drawing.objectId;
 	drawing.extExternal	= !isMediaInternal;
 	
@@ -681,7 +687,7 @@ void pptx_slide_context::Impl::process_media(drawing_object_description& obj, _p
 		
 		_image_file_::GenerateZeroImage(odfPacket_ + FILE_SEPARATOR_STR + L"zero.png");
 	}
-	drawing.fill.bitmap->rId = get_mediaitems().add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal_image, ref_image);		
+	drawing.fill.bitmap->rId = get_mediaitems()->add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal_image, ref_image);		
 	add_additional_rels(isMediaInternal_image, drawing.fill.bitmap->rId, ref_image, typeImage);
 	
 	add_drawing(drawing, false, drawing.objectId, L"NULL", drawing.type);
@@ -714,7 +720,7 @@ void pptx_slide_context::dump_rels(rels & Rels)
 	impl_->get_drawings()->dump_rels(Rels);
 }
 
-mediaitems & pptx_slide_context::get_mediaitems()
+mediaitems_ptr & pptx_slide_context::get_mediaitems()
 {
 	return impl_->get_mediaitems(); 
 }

ASCOfficeOdfFile/src/docx/pptx_slide_context.h

@@ -116,7 +116,7 @@ public:
 
 	void process_drawings();
 
-	mediaitems & get_mediaitems();
+	mediaitems_ptr & get_mediaitems();
 
 	void add_background			(_oox_fill & fill);