Merge pull request #88 from ONLYOFFICE/feature/no-history-gsync

Add --no-historyt to `gclient-sync`

.gitignore

@@ -13,6 +13,11 @@ Common/3dParty/cef/win_32
 Common/3dParty/cef/linux_64
 Common/3dParty/cef/linux_32
 Common/3dParty/cef/mac_64
+Common/3dParty/curl/win_64
+Common/3dParty/curl/win_32
+Common/3dParty/curl/linux_64
+Common/3dParty/curl/linux_32
+Common/3dParty/curl/mac_64
 Common/3dParty/v8/v8
 Common/3dParty/v8/depot_tools
 Common/3dParty/v8/win_64
@@ -20,6 +25,7 @@ Common/3dParty/v8/win_32
 Common/3dParty/v8/linux_64
 Common/3dParty/v8/linux_32
 Common/3dParty/v8/mac_64
+Common/3dParty/openssl/openssl
 **/core_build
 **/Release
 **/Debug
@@ -39,7 +45,13 @@ ASCOfficeXlsFile2/win32/_ASCOfficeXlsFile2_i.c
 ASCOfficeXlsFile2/win32/_ASCOfficeXlsFile2_p.c
 ASCOfficeXlsFile2/win32/dlldata.c
 OfficeUtils/win32/OfficeUtilsLib/OfficeUtilsLib/ReadMe.txt
+X2tConverter/**/Makefile.*
+*.7z
 *.obj
 *.pdb
 *.tlb
 *.idb
+**/.hg
+*.zip
+*.tar.gz
+**/*.build/

.travis.yml

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

ASCOfficeDocFile/Common/Aggregat.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/Common/Callback.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/Common/FormatUtils.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -58,7 +58,10 @@
 
 #include <boost/format.hpp>
 
-namespace DocFormatUtils
+#define GETBITS(from, numL, numH) ((from & (((1 << (numH - numL + 1)) - 1) << numL)) >> numL)
+#define GETBIT(from, num) ((from & (1 << num)) != 0)
+
+namespace DocFileFormat
 {
     typedef unsigned char   Bool8;
     typedef unsigned short  Bool16;
@@ -125,7 +128,7 @@ namespace DocFormatUtils
 			
 			if(bDeleteNoUnicode)
 			{
-				for(size_t pos = 0; pos != data.size(); ++pos)
+				for(size_t pos = 0; pos < data.size(); ++pos)
 				{
 					switch(data[pos])
 					{
@@ -157,7 +160,7 @@ namespace DocFormatUtils
 			}
 			else
 			{
-				for(size_t pos = 0; pos != data.size(); ++pos)
+				for(size_t pos = 0; pos < data.size(); ++pos)
 				{
 					switch(data[pos])
 					{
@@ -166,6 +169,8 @@ namespace DocFormatUtils
                         case '\'': buffer.append(L"&apos;");     break;
                         case '<':  buffer.append(L"&lt;");       break;
                         case '>':  buffer.append(L"&gt;");       break;
+						case '\0':  
+							return buffer;
 						default:   buffer.append(&data[pos], 1);	break;
 					}
 				}
@@ -499,10 +504,11 @@ namespace DocFormatUtils
     
 			facet.widen((char*)bytes, (char*)bytes + size, &result[0]);
 			
-			for (long i=0; i < result.length(); i++)
+			for (size_t i=0; i < result.length(); i++)
 			{
 				STLCollection->push_back(result[i]);
 			}
+            return true;
 		}
 
 		template<class T> static bool GetSTLCollectionFromUtf8( T *STLCollection, unsigned char *bytes, int size)
@@ -533,7 +539,7 @@ namespace DocFormatUtils
 					delete [] pStrUtf16;
 					return GetSTLCollectionFromLocale(STLCollection, bytes,size);
 				}
-				for (long i=0; i < nLength; i++)
+				for (unsigned int i = 0; i < nLength; i++)
 				{
 					STLCollection->push_back(pStrUtf16[i]);
 				}
@@ -563,7 +569,7 @@ namespace DocFormatUtils
 					delete [] pStrUtf32;
 					return GetSTLCollectionFromLocale(STLCollection, bytes, size);
 				}
-				for (long i=0; i < nLength; i++)
+				for (unsigned int i = 0; i < nLength; i++)
 				{
 					STLCollection->push_back(pStrUtf32[i]);
 				}
@@ -635,21 +641,19 @@ namespace DocFormatUtils
 			else
 			{
 				std::string sCodePage;
-				for (int i = 0; i < UNICODE_CONVERTER_ENCODINGS_COUNT; ++i)
+				std::map<int, std::string>::const_iterator pFind = NSUnicodeConverter::mapEncodingsICU.find(code_page);
+				if (pFind != NSUnicodeConverter::mapEncodingsICU.end())
 				{
-					if (code_page == NSUnicodeConverter::Encodings[i].WindowsCodePage)
-					{
-						sCodePage = NSUnicodeConverter::Encodings[i].Name;
-						break;
-					}
+					sCodePage = pFind->second;
 				}
+
 				if (sCodePage.empty())
 					sCodePage = "CP1250"/* + std::to_string(code_page)*/;
 
 				NSUnicodeConverter::CUnicodeConverter oConverter;
 				std::wstring unicode_string = oConverter.toUnicode((char*)bytes, size, sCodePage.c_str());
 			
-				for (long i=0; i < unicode_string.size(); i++)
+				for (size_t i = 0; i < unicode_string.size(); i++)
 				{
 					STLCollection->push_back(unicode_string[i]);
 				}
@@ -766,18 +770,12 @@ namespace DocFormatUtils
 
         static inline std::wstring IntToWideString(int value)
 		{
-#if defined(_WIN32) || defined (_WIN64)
-            wchar_t buff[33] ={};
-            _itow(value, buff, 10);
-            return std::wstring(buff);
-#else
             return (std::to_wstring(value));
-#endif
 		}
+
 		static inline std::wstring DoubleToWideString(double value)
 		{
-			std::wstringstream src;
-			
+			std::wstringstream src;			
 			src << value;
 			
 			return std::wstring(src.str());
@@ -785,8 +783,7 @@ namespace DocFormatUtils
 
 		static inline std::string DoubleToString(double value)
 		{
-			std::stringstream src;
-			
+			std::stringstream src;			
 			src << value;
 			
 			return std::string(src.str());
@@ -813,36 +810,16 @@ namespace DocFormatUtils
 
 		static inline std::wstring IntToFormattedWideString( int value, const wchar_t* format )
 		{
-//			const int size = 33;
-
-//			wchar_t strValue[size] = L"\0";
-
 			if ( format == NULL ) return L"";
-//				swprintf_s( strValue, size, format, value );
-////			}
-//            CString format_str;
-//            format_str.Format(format , value);
-
 			std::wstringstream sstream;
 			sstream << boost::wformat(format) % value;
 			return sstream.str();
-            //return string2std_string( format_str );
 		}
 
 		static inline std::wstring DoubleToFormattedWideString( double value, wchar_t* format )
 		{
 			if ( format == NULL ) return L"";
-			//std::wstring wstr;
 
-			//if ( format != NULL )
-			//{
-   //             CString strValue;
-   //             strValue.Format(format, value);
-
-   //             wstr = string2std_string( strValue );
-			//}
-
-			//return wstr;
 			std::wstringstream sstream;
 			sstream << boost::wformat(format) % value;
 			return sstream.str();
@@ -987,4 +964,3 @@ namespace DocFormatUtils
 	};
 }
 
-using namespace DocFormatUtils;

ASCOfficeDocFile/Common/IOperand.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/Common/IVirtualConstructor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/Common/LanguageCodes.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/Common/SPRMCodes.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/Common/Singleton.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/Common/TargetOptions.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/Common/TextMark.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/Common/XmlTools.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -57,11 +57,11 @@ namespace XMLTools
 	class XMLAttribute
 	========================================================================================================*/
 
-	template <class T> class XMLAttribute
+    class XMLAttribute
 	{
 	private:
-		std::basic_string<T> m_Name;
-		std::basic_string<T> m_Value;
+        std::wstring m_Name;
+        std::wstring m_Value;
 
 	public:
 
@@ -69,56 +69,40 @@ namespace XMLTools
 		{
 
 		}
-
-		/*========================================================================================================*/
-
-		XMLAttribute( const T* name ) : m_Name(name)
+        XMLAttribute( const std::wstring & name ) : m_Name(name)
 		{
 		}
-
-		/*========================================================================================================*/
-
-		XMLAttribute( const T* name, const T* value ) :	m_Name(name), m_Value(value)
+        XMLAttribute( const std::wstring & name, const std::wstring & value ) :	m_Name(name), m_Value(value)
+		{
+        }
+        ~XMLAttribute()
 		{
 		}
-
-		/*========================================================================================================*/
-
-		~XMLAttribute()
+        void SetValue( const std::wstring & value )
 		{
+            m_Value = std::wstring( value );
 		}
-
-		/*========================================================================================================*/
-
-		void SetValue( const T* value )
-		{
-			m_Value = std::basic_string<T>( value );
-		}
-
-		/*========================================================================================================*/
-
-		std::basic_string<T> GetName() const
+        std::wstring GetName() const
 		{
 			return m_Name;
 		}
-
 		/*========================================================================================================*/
 
-		std::basic_string<T> GetValue() const
+        std::wstring GetValue() const
 		{
 			return m_Value;
 		}
 
 		/*========================================================================================================*/
 
-		std::basic_string<T> GetXMLString()
+        std::wstring GetXMLString()
 		{
-			std::basic_string<T> xmlString( L"" );
+            std::wstring xmlString( L"" );
 
 			xmlString += m_Name;
-			xmlString += std::basic_string<T>( L"=\"" );
+            xmlString += std::wstring( L"=\"" );
 			xmlString += m_Value;
-			xmlString += std::basic_string<T>( L"\"" );
+            xmlString += std::wstring( L"\"" );
 
 			return xmlString;
 		}
@@ -128,86 +112,63 @@ namespace XMLTools
 	class XMLElement
     ========================================================================================================*/
 
-	template <class T> class XMLElement
+    class XMLElement
 	{
-		typedef std::pair< std::basic_string<T>, std::basic_string<T> > AttributeValuePair;
+        typedef std::pair< std::wstring, std::wstring> AttributeValuePair;
 
 	private:
-		std::basic_string<T>									m_Name;
-		std::basic_string<T>									m_ElementText;
-		std::map<std::basic_string<T>, std::basic_string<T>>	m_AttributeMap;
-		std::map<std::basic_string<T>, int>						m_ChildMap; //for uniq
-        std::list<XMLElement<T>>								m_Elements;
+        std::wstring									m_Name;
+        std::wstring									m_ElementText;
+        std::map<std::wstring, std::wstring>            m_AttributeMap;
+        std::map<std::wstring, int>						m_ChildMap; //for uniq
+        std::list<XMLElement>                           m_Elements;
 
-        typedef typename std::list<XMLElement<T>>::iterator          ElementsIterator;
-        typedef typename std::list<XMLElement<T>>::const_iterator    ElementsIteratorConst;
+        typedef std::list<XMLElement>::iterator          ElementsIterator;
+        typedef std::list<XMLElement>::const_iterator    ElementsIteratorConst;
 
-        typedef typename std::map<std::basic_string<T>, std::basic_string<T>>::iterator            AttMapIterator;
-        typedef typename std::map<std::basic_string<T>, std::basic_string<T>>::const_iterator      AttMapIteratorConst;
+        typedef std::map<std::wstring, std::wstring>::iterator            AttMapIterator;
+        typedef std::map<std::wstring, std::wstring>::const_iterator      AttMapIteratorConst;
 
     public:
 
-		XMLElement()
+        XMLElement() {}
+
+        XMLElement( const std::wstring & name ) : m_Name(name)
 		{
 
 		}
-
-		/*========================================================================================================*/
-
-		XMLElement( const T* name ) : m_Name(name)
+        XMLElement( const std::wstring & prefix, const std::wstring & localName ) :
+            m_Name( std::wstring( prefix ) + std::wstring( L":" ) + std::wstring( localName ) ), m_ElementText( L"" )
 		{
 
 		}
+        ~XMLElement() {}
 
-		/*========================================================================================================*/
-
-		XMLElement( const T* prefix, const T* localName ) : m_Name( std::basic_string<T>( prefix ) + std::basic_string<T>( L":" ) + std::basic_string<T>( localName ) ), m_ElementText( L"" )
+        void AppendText( const std::wstring & text )
 		{
-
+            m_ElementText = std::wstring( text );
 		}
 
-		/*========================================================================================================*/
-
-		~XMLElement()
+        void AppendTextSymbol( const wchar_t symbol )
 		{
-
+            m_ElementText += std::wstring( &symbol );
 		}
 
-		/*========================================================================================================*/
-
-		void AppendText( const T* text )
-		{
-			m_ElementText = std::basic_string<T>( text );
-		}
-
-		/*========================================================================================================*/
-
-		void AppendTextSymbol( const T symbol )
-		{
-			m_ElementText += std::basic_string<T>( &symbol );
-		}
-
-		/*========================================================================================================*/
-
-		void AppendAttribute( const XMLAttribute<T>& attribute )
+        void AppendAttribute( const XMLAttribute& attribute )
 		{
 			AttributeValuePair p( attribute.GetName(), attribute.GetValue() );
 
 			m_AttributeMap.insert( p );
 		}
 
-		/*========================================================================================================*/
-
-		void AppendAttribute( const T* name, const T* value )
+        void AppendAttribute( const std::wstring & name, const std::wstring & value )
 		{
-			AttributeValuePair p( std::basic_string<T>( const_cast<T*>( name ) ), std::basic_string<T>( const_cast<T*>( value ) ) );
+            AttributeValuePair p(  name , value  );
 
 			m_AttributeMap.insert( p );
 		}
 
-		/*========================================================================================================*/
-
-		void AppendChild( const XMLElement<T>& element, bool uniq = false)
+        void AppendChild( const XMLElement& element, bool uniq = false)
 		{
 			if (m_ChildMap.find(element.GetName()) != m_ChildMap.end())
 			{
@@ -215,21 +176,17 @@ namespace XMLTools
 			}
 			else
 			{
-				m_ChildMap.insert(m_ChildMap.end(), std::pair<std::basic_string<T>, int>(element.GetName(), 0));
+                m_ChildMap.insert(m_ChildMap.end(), std::pair<std::wstring, int>(element.GetName(), 0));
 			}
 			m_Elements.push_back( element );
 		}
 
-		/*========================================================================================================*/
-
-		void RemoveChild( const XMLElement<T>& element )
+        void RemoveChild( const XMLElement& element )
 		{
 			m_Elements.remove( element );
 		}
 
-		/*========================================================================================================*/
-
-		bool FindChild( const XMLElement<T>& element )
+        bool FindChild( const XMLElement& element )
 		{
 			bool result = false;
 
@@ -246,15 +203,13 @@ namespace XMLTools
 			return result;
 		}
 
-		/*========================================================================================================*/
-
-		bool FindChildByName( const T* elementName ) const
+        bool FindChildByName( const std::wstring & elementName ) const
 		{
 			bool result = false;
 
-            for ( ElementsIterator iter = m_Elements.begin(); iter != m_Elements.end(); iter++ )
+            for ( ElementsIteratorConst iter = m_Elements.begin(); iter != m_Elements.end(); iter++ )
 			{
-				if ( iter->m_Name == std::basic_string<T>( elementName ) )
+                if ( iter->m_Name == std::wstring( elementName ) )
 				{
 					result = true;
 
@@ -265,9 +220,7 @@ namespace XMLTools
 			return result;
 		}
 
-		/*========================================================================================================*/
-
-		bool RemoveChildByName( const std::basic_string<T>& elementName )
+        bool RemoveChildByName( const std::wstring& elementName )
 		{
 			bool result = false;
 
@@ -286,9 +239,7 @@ namespace XMLTools
 			return result;  
 		}
 
-		/*========================================================================================================*/
-
-		bool operator == ( const XMLElement<T>& element ) const
+        bool operator == ( const XMLElement& element ) const
 		{
 			bool result = false;
 
@@ -319,7 +270,7 @@ namespace XMLTools
 			}
 			else
 			{
-				ElementsIteratorConst        thisIter    = m_Elements.begin();
+                ElementsIteratorConst  thisIter    = m_Elements.begin();
 				ElementsIteratorConst  elementIter = element.m_Elements.begin();
 
 				for ( ; thisIter != m_Elements.end(); thisIter++, elementIter++ )
@@ -336,34 +287,34 @@ namespace XMLTools
 
 		/*========================================================================================================*/
 
-        std::basic_string<T> GetName() const
+        std::wstring GetName() const
 		{
 			return m_Name;
 		}
 
 		/*========================================================================================================*/
 
-        std::basic_string<T> GetXMLString()
+        std::wstring GetXMLString()
 		{
-			std::basic_string<T> xmlString( L"");
+            std::wstring xmlString( L"");
 
-            bool bIsNameExists = ( m_Name != std::basic_string<T>( L"") );
-            bool bIsTextExists = ( m_ElementText != std::basic_string<T>( L"") );
+            bool bIsNameExists = ( m_Name != std::wstring( L"") );
+            bool bIsTextExists = ( m_ElementText != std::wstring( L"") );
 
 			if ( bIsNameExists )
 			{
-                xmlString += std::basic_string<T>( L"<" ) + m_Name;
+                xmlString += std::wstring( L"<" ) + m_Name;
 			}
 
             if ( ( bIsNameExists ) && ( m_AttributeMap.size() > 0 ) )
 			{
                 for ( AttMapIterator iter = m_AttributeMap.begin(); iter != m_AttributeMap.end(); iter++ )
 				{
-					xmlString += std::basic_string<T>( L" " );
+                    xmlString += std::wstring( L" " );
 					xmlString += iter->first;
-					xmlString += std::basic_string<T>( L"=\"" );
+                    xmlString += std::wstring( L"=\"" );
 					xmlString += iter->second;
-					xmlString += std::basic_string<T>( L"\"" );
+                    xmlString += std::wstring( L"\"" );
 				}
 			}
 
@@ -371,7 +322,7 @@ namespace XMLTools
 			{
 				if ( bIsNameExists )
 				{
-					xmlString += std::basic_string<T>( L">" );
+                    xmlString += std::wstring( L">" );
 				}
 
                 for ( ElementsIterator iter = m_Elements.begin(); iter != m_Elements.end(); iter++ )
@@ -386,16 +337,16 @@ namespace XMLTools
 
 				if ( bIsNameExists )
 				{
-                    xmlString += std::basic_string<T>( L"</" );
+                    xmlString += std::wstring( L"</" );
 					xmlString += m_Name;
-					xmlString += std::basic_string<T>( L">" );
+                    xmlString += std::wstring( L">" );
 				}
 			}
 			else
 			{
 				if ( bIsNameExists )
 				{
-					xmlString += std::basic_string<T>( L"/>" );
+                    xmlString += std::wstring( L"/>" );
 				}
 			}
 
@@ -442,7 +393,7 @@ namespace XMLTools
 			else
 			{
 				std::string s(m_str.begin(), m_str.end());
-				file.WriteFile((unsigned char*)s.c_str(), s.length());
+				file.WriteFile((unsigned char*)s.c_str(), (DWORD)s.length());
 			}
 			file.CloseFile();
 			return true;
@@ -455,34 +406,12 @@ namespace XMLTools
 
 		void WriteInteger(int Value, int Base = 10)
 		{
-#if defined(_WIN32) || defined (_WIN64)
-            wchar_t buff[33] ={};
-            _itow(Value, buff, Base);
-            m_str += std::wstring(buff);
-#else
             m_str += std::to_wstring(Value);
-#endif
 		}
 
 		void WriteDouble(double Value)
 		{
-#if defined(_WIN32) || defined (_WIN64)
-            int *dec = NULL, *sign = NULL;
-			char *str = _fcvt( Value , 4, dec, sign);
-
-			if (str)
-			{
-				std::string sA(str);
-				delete []str;	
-				m_str += std::wstring(sA.begin(), sA.end());
-			}
-			else
-			{
-				m_str += L"0";
-			}
-#else
             m_str += std::to_wstring(Value);
-#endif
         }
 		void WriteBoolean(bool Value)
 		{

ASCOfficeDocFile/Common/utf8.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/AbstractOpenXmlMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/AnnotationOwnerList.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -41,7 +41,7 @@ namespace DocFileFormat
 	public: 
 		AnnotationOwnerList(FileInformationBlock* fib, POLE::Stream* tableStream) : std::vector<std::wstring>()
 		{
-			VirtualStreamReader reader(tableStream, fib->m_FibWord97.fcGrpXstAtnOwners, fib->m_bOlderVersion);
+			VirtualStreamReader reader(tableStream, fib->m_FibWord97.fcGrpXstAtnOwners, fib->m_nWordVersion);
 			
 			if (fib->m_FibWord97.fcGrpXstAtnOwners > reader.GetSize()) return;
 

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -40,7 +40,7 @@ namespace DocFileFormat
 
 		//read the user initials (LPXCharBuffer9)
 
-		if (reader->olderVersion)
+		if (reader->nWordVersion > 0)
 		{
 			short cch = reader->ReadByte();
 		
@@ -76,4 +76,4 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>(newObject);
 	}
-}
+}

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -41,9 +41,9 @@ namespace DocFileFormat
 		static const int STRUCTURE_SIZE = 30;
 		static const int STRUCTURE_SIZE_OLD = 20;
 
-		static const int GetSize(bool bOldVersion)
+		static const int GetSize(int nWordVersion)
 		{
-			return bOldVersion ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
+			return (nWordVersion > 0) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
 		}
 
 		inline std::wstring GetUserInitials() const

ASCOfficeDocFile/DocDocxConverter/AutoSummaryInfo.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/BookmarkFirst.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/BorderCode.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -118,70 +118,78 @@ namespace DocFileFormat
 
 	public:
 		/// Creates a new BorderCode with default values
-		BorderCode(): cv(0), dptLineWidth(0), brcType(0), ico( Global::ColorIdentifier[0] ), dptSpace(0), fShadow(false), fFrame(false), fNil(false)
+		BorderCode(): cv(0), dptLineWidth(0), brcType(0), ico( Global::ColorNameIdentifier[0] ), dptSpace(0), fShadow(false), fFrame(false), fNil(false)
 		{
 		}
 
 		/// Parses the unsigned char for a BRC
 		BorderCode( unsigned char* bytes, int size ):
-		cv(0), dptLineWidth(0), brcType(0), ico( Global::ColorIdentifier[0] ), dptSpace(0), fShadow(false), fFrame(false), fNil(false)
+		cv(0), dptLineWidth(0), brcType(0), ico( Global::ColorNameIdentifier[0] ), dptSpace(0), fShadow(false), fFrame(false), fNil(false)
 		{
 			if ( FormatUtils::ArraySum( bytes, size ) ==  ( size * 255 ) )
 			{
-				this->fNil = true;
+				fNil = true;
 			}
 			else if ( size == 8 )
 			{
 				//it's a border code of Word 2000/2003
-				this->cv = FormatUtils::BytesToInt32( bytes, 0, size );
-				this->ico = std::wstring( Global::ColorIdentifier[0] );
+				cv = FormatUtils::BytesToInt32( bytes, 0, size );
+				ico = std::wstring( Global::ColorIdentifier[0] );
 
-				this->dptLineWidth = bytes[4];
-				this->brcType = bytes[5];
+				dptLineWidth = bytes[4];
+				brcType = bytes[5];
 
 				short val = FormatUtils::BytesToInt16( bytes, 6, size );
-				this->dptSpace = val & 0x001F;
+				dptSpace = val & 0x001F;
 
 				//not sure if this is correct, the values from the spec are definitly wrong:
-				this->fShadow = FormatUtils::BitmaskToBool( val, 0x20 );
-				this->fFrame = FormatUtils::BitmaskToBool( val, 0x40 );
+				fShadow = FormatUtils::BitmaskToBool( val, 0x20 );
+				fFrame = FormatUtils::BitmaskToBool( val, 0x40 );
 			}
 			else if ( size == 4 )
 			{
-				//it's a border code of Word 97
 				unsigned short val = FormatUtils::BytesToUInt16( bytes, 0, size );
-				this->dptLineWidth = (unsigned char)( val & 0x00FF );
-				this->brcType = (unsigned char)( ( val & 0xFF00 ) >> 8 );
+
+				dptLineWidth = (unsigned char)( val & 0x00FF );
+				brcType = (unsigned char)( ( val & 0xFF00 ) >> 8 );
+
 				val = FormatUtils::BytesToUInt16( bytes, 2, size );
-				this->ico = FormatUtils::MapValueToWideString( ( val & 0x00FF ), &Global::ColorIdentifier[0][0], 17, 12 );
-				this->dptSpace = ( val & 0x1F00 ) >> 8;
+
+				ico = FormatUtils::MapValueToWideString( ( val & 0x00FF ), &Global::ColorNameIdentifier[0][0], 17, 12 );
+				dptSpace = ( val & 0x1F00 ) >> 8;
 			}
-			else
+			else if (size == 2)
 			{
-				//throw new ByteParseException("Cannot parse the struct BRC, the length of the struct doesn't match");
+				unsigned short val = FormatUtils::BytesToUInt16( bytes, 0, size );
+				
+				dptLineWidth	= GETBITS(val, 0, 2);
+				brcType			= GETBITS(val, 3, 4);
+				fShadow			= GETBIT(val, 5);
+				ico				= FormatUtils::MapValueToWideString(GETBITS(val, 6, 10), &Global::ColorNameIdentifier[0][0], 17, 12 );
+				dptSpace		= GETBITS(val, 11, 15);
+
 			}
 		}
-
 		BorderCode( const BorderCode& bc )
 		{
 			if ( this != &bc )
 			{
-				this->cv = bc.cv;
-				this->dptLineWidth = bc.dptLineWidth;
-				this->brcType = bc.brcType;
-				this->ico = bc.ico;
-				this->dptSpace = bc.dptSpace;
-				this->fShadow = bc.fShadow;
-				this->fFrame = bc.fFrame;
-				this->fNil = bc.fNil;
+				cv				= bc.cv;
+				dptLineWidth	= bc.dptLineWidth;
+				brcType			= bc.brcType;
+				ico				= bc.ico;
+				dptSpace		= bc.dptSpace;
+				fShadow			= bc.fShadow;
+				fFrame			= bc.fFrame;
+				fNil			= bc.fNil;
 			}
 		}
 
 		bool operator == ( const BorderCode& bc )
 		{
-			if ( ( this->cv == bc.cv ) && ( this->dptLineWidth == bc.dptLineWidth ) && ( this->brcType == bc.brcType ) &&
-				( this->ico == bc.ico ) && ( this->dptSpace == bc.dptSpace ) && ( this->fShadow == bc.fShadow ) &&
-				( this->fFrame == bc.fFrame ) && ( this->fNil == bc.fNil ) )
+			if ( ( cv == bc.cv ) && ( dptLineWidth == bc.dptLineWidth ) && ( brcType == bc.brcType ) &&
+				( ico == bc.ico ) && ( dptSpace == bc.dptSpace ) && ( fShadow == bc.fShadow ) &&
+				( fFrame == bc.fFrame ) && ( fNil == bc.fNil ) )
 			{
 				return true;
 			}

ASCOfficeDocFile/DocDocxConverter/ByteStructure.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -38,7 +38,7 @@ namespace DocFileFormat
 		: PropertiesMapping( writer ), _isRunStyleNeeded(isRunStyleNeeded), _isOwnRPr(true), _isRTL(false)
 	{
 		_doc			= doc;
-		_rPr			= new XMLTools::XMLElement<wchar_t>( _T( "w:rPr" ) );
+        _rPr			= new XMLTools::XMLElement( L"w:rPr");
 		_revisionData	= rev;
 		_currentPapx	= currentPapx;
 		_styleChpx		= styleChpx;
@@ -46,7 +46,7 @@ namespace DocFileFormat
 		_webHidden		= false;
 	}
 
-	CharacterPropertiesMapping::CharacterPropertiesMapping( XMLTools::XMLElement<wchar_t>* rPr, WordDocument* doc, RevisionData* rev, ParagraphPropertyExceptions* currentPapx, bool styleChpx, bool isRunStyleNeeded )
+    CharacterPropertiesMapping::CharacterPropertiesMapping( XMLTools::XMLElement* rPr, WordDocument* doc, RevisionData* rev, ParagraphPropertyExceptions* currentPapx, bool styleChpx, bool isRunStyleNeeded )
 		: PropertiesMapping( NULL ), _isRunStyleNeeded(isRunStyleNeeded), _isOwnRPr(false), _isRTL(false)   
 	{
 		_doc			= doc;
@@ -77,7 +77,7 @@ namespace DocFileFormat
 		// apend revision changes
 		if (_revisionData->Type == Changed)
 		{
-			XMLTools::XMLElement<wchar_t> rPrChange( _T( "w:rPrChange" ) );
+            XMLTools::XMLElement rPrChange( L"w:rPrChange");
 
 			//todooo date - _revisionData->Dttm.Convert( new DateMapping( rPrChange ) );
 
@@ -85,7 +85,7 @@ namespace DocFileFormat
 			
 			if (author_str)
 			{
-				XMLTools::XMLAttribute<wchar_t> author( _T( "w:author" ), FormatUtils::XmlEncode(*author_str).c_str());
+                XMLTools::XMLAttribute author( L"w:author", FormatUtils::XmlEncode(*author_str));
 				rPrChange.AppendAttribute( author );
 			}
 
@@ -98,7 +98,7 @@ namespace DocFileFormat
 		//write properties
 		if ( ( m_pXmlWriter != NULL ) && ( ( _rPr->GetChildCount() > 0 ) || ( _rPr->GetAttributeCount() > 0 ) ) )
 		{
-			m_pXmlWriter->WriteString( _rPr->GetXMLString().c_str() );
+			m_pXmlWriter->WriteString( _rPr->GetXMLString());
 		}
 	}
 
@@ -108,7 +108,7 @@ namespace DocFileFormat
 	{
 		//Todo сделать определение симольного шрифта через fontManager
 		//Заглушка под Google Docs, они пишут bullet в Arial
-		if (-1 != m_sAsciiFont.find (_T("Arial")) && -1 != m_sEastAsiaFont.find (_T("Arial")) && -1 != m_shAnsiFont.find (_T("Arial")))
+        if (-1 != m_sAsciiFont.find (L"Arial") && -1 != m_sEastAsiaFont.find (L"Arial") && -1 != m_shAnsiFont.find (L"Arial"))
 			return false;
 
 		return true;
@@ -116,377 +116,380 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 
-	void CharacterPropertiesMapping::convertSprms( std::list<SinglePropertyModifier>* sprms, XMLTools::XMLElement<wchar_t>* parent )
+    void CharacterPropertiesMapping::convertSprms( std::list<SinglePropertyModifier>* sprms, XMLTools::XMLElement* parent )
 	{
-		XMLTools::XMLElement<wchar_t>	* rFonts	= new XMLTools::XMLElement<wchar_t>		( _T( "w:rFonts" ) );
-		XMLTools::XMLElement<wchar_t>	* color		= new XMLTools::XMLElement<wchar_t>		( _T( "w:color" ) );
-		XMLTools::XMLAttribute<wchar_t>	* colorVal	= new XMLTools::XMLAttribute<wchar_t>	( _T( "w:val" ) );
-		XMLTools::XMLElement<wchar_t>	* lang		= new XMLTools::XMLElement<wchar_t>		( _T( "w:lang" ) );
+        XMLTools::XMLElement	* rFonts	= new XMLTools::XMLElement		( L"w:rFonts" );
+        XMLTools::XMLElement	* color		= new XMLTools::XMLElement		( L"w:color" );
+        XMLTools::XMLAttribute	* colorVal	= new XMLTools::XMLAttribute	( L"w:val" );
+        XMLTools::XMLElement	* lang		= new XMLTools::XMLElement		( L"w:lang" );
 
 		if (_webHidden)
 		{
-			XMLTools::XMLElement<wchar_t>	* webHidden		= new XMLTools::XMLElement<wchar_t>	( _T( "w:webHidden" ) );
+            XMLTools::XMLElement	* webHidden		= new XMLTools::XMLElement	( L"w:webHidden" );
 			parent->AppendChild( *webHidden );
 			RELEASEOBJECT( webHidden );
 		}
-		std::list<SinglePropertyModifier>::iterator end = sprms->end();
-		for (std::list<SinglePropertyModifier>::iterator iter = sprms->begin(); iter != end; ++iter)
+		if ((sprms) && (!sprms->empty()))
 		{
-			int nProperty = 0; //for unknown test
-
-			switch ( (int)( iter->OpCode ) )
+			std::list<SinglePropertyModifier>::iterator end = sprms->end();
+			for (std::list<SinglePropertyModifier>::iterator iter = sprms->begin(); iter != end; ++iter)
 			{
-			case sprmOldCIstd :
-			case sprmCIstd :	//	style id 
+				int nProperty = 0; //for unknown test
+
+				switch ( (int)( iter->OpCode ) )
 				{
-					if (_isRunStyleNeeded && !_webHidden)
+				case sprmOldCIstd :
+				case sprmCIstd :	//	style id 
 					{
-						_currentIstd = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-						if (_currentIstd < _doc->Styles->Styles->size())
+						if (_isRunStyleNeeded && !_webHidden)
 						{
-							appendValueElement( parent, _T( "rStyle" ), StyleSheetMapping::MakeStyleId( _doc->Styles->Styles->at( _currentIstd ) ).c_str(), true );
+							_currentIstd = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+							if (_currentIstd < _doc->Styles->Styles->size())
+							{
+								appendValueElement( parent, L"rStyle", StyleSheetMapping::MakeStyleId( _doc->Styles->Styles->at( _currentIstd ) ), true );
+							}
+						}
+					}break;	
+
+				case sprmCFBiDi :
+					appendFlagElement( parent, *iter, L"rtl", true );
+					_isRTL = true;
+					break;
+
+				case sprmOldCFBold :
+				case sprmCFBold :
+					appendFlagElement( parent, *iter, L"b", true );
+					break;
+
+				case sprmCFBoldBi :
+					appendFlagElement( parent, *iter, L"bCs", true );
+					break;
+
+				case sprmOldCFCaps :
+				case sprmCFCaps :
+					appendFlagElement( parent, *iter, L"caps", true );
+					break;
+
+				case sprmCFComplexScripts :
+					appendFlagElement( parent, *iter, L"cs", true );
+					break;
+
+				case sprmCFDStrike :
+					appendFlagElement( parent, *iter, L"dstrike", true );
+					break;
+
+				case sprmCFEmboss :
+					appendFlagElement( parent, *iter, L"emboss", true );
+					break;
+
+				case sprmCFImprint :
+					appendFlagElement( parent, *iter, L"imprint", true );
+					break;
+
+				case sprmOldCFItalic :
+				case sprmCFItalic :
+					appendFlagElement( parent, *iter, L"i", true );
+					break;
+
+				case sprmCFItalicBi:
+					appendFlagElement( parent, *iter, L"iCs", true );
+					break;
+
+				case 0x0875:
+					appendFlagElement( parent, *iter, L"noProof", true );
+					break;
+
+				case sprmOldCFOutline:
+				case sprmCFOutline:
+					appendFlagElement( parent, *iter, L"outline", true );
+					break;
+
+				case sprmOldCFShadow:
+				case sprmCFShadow:
+					appendFlagElement( parent, *iter, L"shadow", true );
+					break;
+
+				case sprmOldCFSmallCaps:
+				case sprmCFSmallCaps:
+					appendFlagElement( parent, *iter, L"smallCaps", true );
+					break;
+
+				case sprmCFSpecVanish:
+					appendFlagElement( parent, *iter, L"specVanish", true );
+					break;
+
+				case sprmOldCFStrike:
+				case sprmCFStrike:
+					appendFlagElement( parent, *iter, L"strike", true );
+					break;
+
+				case sprmOldCFVanish:
+				case sprmCFVanish:
+					appendFlagElement( parent, *iter, L"vanish", true );
+					break;
+
+				case 0x0811:
+					appendFlagElement( parent, *iter, L"webHidden", true );
+					break;
+
+				case sprmOldCIss:
+				case sprmCIss:
+					if (iter->argumentsSize > 0 && iter->Arguments[0] < 3)	//Metaevan.doc
+						appendValueElement( parent, L"vertAlign", FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ), true );
+					break;	
+
+				case sprmCRgLid0_80:
+				case sprmCRgLid0:
+					{	//latin					
+						LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
+
+						LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, Default );
+
+						langid.Convert( langIDMapping );
+
+						RELEASEOBJECT( langIDMapping );
+					}break;	
+
+				case sprmOldCLid:
+				case sprmCRgLid1_80:
+				case sprmCRgLid1:
+					{	//east asia				
+						LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
+
+						LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, EastAsian );
+
+						langid.Convert( langIDMapping );
+
+						RELEASEOBJECT( langIDMapping );
+					}break;
+
+				case sprmCLidBi:
+					{					
+						LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
+
+						LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, Complex );
+
+						langid.Convert( langIDMapping );
+
+						RELEASEOBJECT( langIDMapping );
+					}break;	
+
+				case sprmCBrc80:
+				case sprmCBrc:
+					{  //borders
+						XMLTools::XMLElement bdr( L"w:bdr" );
+						BorderCode bc( iter->Arguments, iter->argumentsSize );
+						appendBorderAttributes( &bc, &bdr );
+						parent->AppendChild( bdr );
+					}break;		
+
+				case sprmCShd80:
+				case sprmCShd:
+					{  //shading
+						ShadingDescriptor desc( iter->Arguments, iter->argumentsSize );
+
+						appendShading( parent, desc );
+					}break;		
+
+				case sprmOldCIco:
+				case sprmCIco:
+				case sprmCIcoBi:
+					{//color
+						colorVal->SetValue( FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ));
+					}break;
+
+				case sprmCCv:
+					{
+						std::wstringstream sstream;
+
+						sstream << boost::wformat(L"%02x%02x%02x") % iter->Arguments[0] % /*G*/iter->Arguments[1] % /*B*/iter->Arguments[2];
+						colorVal->SetValue(sstream.str());
+					}break;	
+
+				case sprmCOldHighlight:
+					{
+						appendValueElement( parent, L"highlight", FormatUtils::MapValueToWideString( iter->Arguments[1], &Global::ColorNameIdentifier[0][0], 17, 12 ), true );
+					}break;	
+				case sprmCHighlight:
+					{
+						appendValueElement( parent, L"highlight", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorNameIdentifier[0][0], 17, 12 ), true );
+					}break;	
+
+				case sprmOldCDxaSpace:
+				case sprmCDxaSpace:
+					{
+						appendValueElement( parent, L"spacing", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
+					}break;
+
+				case sprmCFtcBi :
+					{//default from FontTable
+						size_t nIndex	=	FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize);
+						if( nIndex < _doc->FontTable->Data.size() )
+						{
+							FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
+							if (ffn)
+								m_sDefaultFont = ffn->xszFtn;
+						}
+					}break;
+
+				case sprmCHpsBi :
+					{
+						appendValueElement( parent, L"szCs",
+							FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );						
+					}
+					break;
+	// Font Size in points (2~3276) default 20-half-points
+				case sprmOldCHps :
+					{
+						appendValueElement (parent, L"sz",
+							FormatUtils::IntToWideString (FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize) ),
+							true );
+					}break;
+				case sprmCHps : 
+					{  
+						appendValueElement (parent, L"sz",
+							FormatUtils::IntToWideString (FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize) ), true );						
+					}break;
+
+				case sprmCMajority :
+					{	//for complex props
+					}break;
+
+				case sprmOldCHpsPos: 
+					{	// The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168)
+						short nVertPos = FormatUtils::BytesToUChar(iter->Arguments, 0, iter->argumentsSize);
+						appendValueElement (parent, L"position", nVertPos, true);
+					}break;
+				case sprmCHpsPos: 
+					{	// The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168)
+						short nVertPos = FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize);
+						appendValueElement (parent, L"position", nVertPos, true);
+					}break;
+
+				case sprmOldCHpsKern:
+				case sprmCHpsKern:
+					{
+						appendValueElement( parent, L"kern", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
+					}break;
+
+				case sprmOldCFtc:
+				case sprmCRgFtc0:
+					{	// font family
+						size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+						
+						if( nIndex < _doc->FontTable->Data.size() )
+						{
+							XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( L"w:ascii" );
+							FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
+							m_sAsciiFont = ffn->xszFtn;
+							ascii->SetValue( FormatUtils::XmlEncode(m_sAsciiFont, true));
+							rFonts->AppendAttribute( *ascii );
+							RELEASEOBJECT( ascii );
+						}
+					}break;
+
+				case sprmCRgFtc1:
+					{
+						size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+
+						if( nIndex >= 0 && nIndex < _doc->FontTable->Data.size() )
+						{
+							XMLTools::XMLAttribute* eastAsia = new XMLTools::XMLAttribute( L"w:eastAsia" );
+							FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
+							m_sEastAsiaFont = ffn->xszFtn;
+							eastAsia->SetValue( FormatUtils::XmlEncode(m_sEastAsiaFont));
+							rFonts->AppendAttribute( *eastAsia );
+							RELEASEOBJECT( eastAsia );
 						}
 					}
-				}break;	
+					break;
 
-			case sprmCFBiDi :
-				appendFlagElement( parent, *iter, _T( "rtl" ), true );
-				_isRTL = true;
-				break;
-
-			case sprmOldCFBold :
-			case sprmCFBold :
-				appendFlagElement( parent, *iter, _T( "b" ), true );
-				break;
-
-			case sprmCFBoldBi :
-				appendFlagElement( parent, *iter, _T( "bCs" ), true );
-				break;
-
-			case sprmOldCFCaps :
-			case sprmCFCaps :
-				appendFlagElement( parent, *iter, _T( "caps" ), true );
-				break;
-
-			case sprmCFComplexScripts :
-				appendFlagElement( parent, *iter, _T( "cs" ), true );
-				break;
-
-			case sprmCFDStrike :
-				appendFlagElement( parent, *iter, _T( "dstrike" ), true );
-				break;
-
-			case sprmCFEmboss :
-				appendFlagElement( parent, *iter, _T( "emboss" ), true );
-				break;
-
-			case sprmCFImprint :
-				appendFlagElement( parent, *iter, _T( "imprint" ), true );
-				break;
-
-			case sprmOldCFItalic :
-			case sprmCFItalic :
-				appendFlagElement( parent, *iter, _T( "i" ), true );
-				break;
-
-			case sprmCFItalicBi:
-				appendFlagElement( parent, *iter, _T( "iCs" ), true );
-				break;
-
-			case 0x0875:
-				appendFlagElement( parent, *iter, _T( "noProof" ), true );
-				break;
-
-			case sprmOldCFOutline:
-			case sprmCFOutline:
-				appendFlagElement( parent, *iter, _T( "outline" ), true );
-				break;
-
-			case sprmOldCFShadow:
-			case sprmCFShadow:
-				appendFlagElement( parent, *iter, _T( "shadow" ), true );
-				break;
-
-			case sprmOldCFSmallCaps:
-			case sprmCFSmallCaps:
-				appendFlagElement( parent, *iter, _T( "smallCaps" ), true );
-				break;
-
-			case sprmCFSpecVanish:
-				appendFlagElement( parent, *iter, _T( "specVanish" ), true );
-				break;
-
-			case sprmOldCFStrike:
-			case sprmCFStrike:
-				appendFlagElement( parent, *iter, _T( "strike" ), true );
-				break;
-
-			case sprmOldCFVanish:
-			case sprmCFVanish:
-				appendFlagElement( parent, *iter, _T( "vanish" ), true );
-				break;
-
-			case 0x0811:
-				appendFlagElement( parent, *iter, _T( "webHidden" ), true );
-				break;
-
-			case sprmOldCIss:
-			case sprmCIss:
-				appendValueElement( parent, _T( "vertAlign" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ).c_str(), true );
-				break;	
-
-			case sprmCRgLid0_80:
-			case sprmCRgLid0:
-				{	//latin					
-					LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-
-					LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, Default );
-
-					langid.Convert( langIDMapping );
-
-					RELEASEOBJECT( langIDMapping );
-				}break;	
-
-			case sprmOldCLid:
-			case sprmCRgLid1_80:
-			case sprmCRgLid1:
-				{	//east asia				
-					LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-
-					LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, EastAsian );
-
-					langid.Convert( langIDMapping );
-
-					RELEASEOBJECT( langIDMapping );
-				}break;
-
-			case sprmCLidBi:
-				{					
-					LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-
-					LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, Complex );
-
-					langid.Convert( langIDMapping );
-
-					RELEASEOBJECT( langIDMapping );
-				}break;	
-
-			case sprmCBrc80:
-			case sprmCBrc:
-				{  //borders
-					XMLTools::XMLElement<wchar_t> bdr( _T( "w:bdr" ) );
-					BorderCode bc( iter->Arguments, iter->argumentsSize );
-					appendBorderAttributes( &bc, &bdr );
-					parent->AppendChild( bdr );
-				}break;		
-
-			case sprmCShd80:
-			case sprmCShd:
-				{  //shading
-					ShadingDescriptor desc( iter->Arguments, iter->argumentsSize );
-
-					appendShading( parent, desc );
-				}break;		
-
-			case sprmOldCIco:
-			case sprmCIco:
-			case sprmCIcoBi:
-				{//color
-					colorVal->SetValue( FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ).c_str() );
-				}break;
-
-			case sprmCCv:
-				{
-					std::wstringstream sstream;
-
-					sstream << boost::wformat(L"%02x%02x%02x") % iter->Arguments[0] % /*G*/iter->Arguments[1] % /*B*/iter->Arguments[2];
-					colorVal->SetValue(sstream.str().c_str());
-                    //CString rgbColor;
-                    //rgbColor.Format( _T( "%02x%02x%02x" ), /*R*/iter->Arguments[0], /*G*/iter->Arguments[1], /*B*/iter->Arguments[2] );
-                    //colorVal->SetValue( rgbColor.GetString() );
-				}break;	
-
-			case sprmCOldHighlight:
-				{
-					appendValueElement( parent, _T( "highlight" ), FormatUtils::MapValueToWideString( iter->Arguments[1], &Global::ColorIdentifier[0][0], 17, 12 ).c_str(), true );
-				}break;	
-			case sprmCHighlight:
-				{
-					appendValueElement( parent, _T( "highlight" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ).c_str(), true );
-				}break;	
-
-			case sprmOldCDxaSpace:
-			case sprmCDxaSpace:
-				{
-					appendValueElement( parent, _T( "spacing" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
-				}break;
-
-			case sprmCFtcBi :
-				{//default from FontTable
-					SHORT nIndex	=	FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize);
-					if( nIndex < _doc->FontTable->Data.size() )
+				case sprmCRgFtc2:
 					{
-						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
-						if (ffn)
-							m_sDefaultFont = ffn->xszFtn;
-					}
-				}break;
+						size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
 
-			case sprmCHpsBi :
-				{
-					appendValueElement( parent, _T( "szCs" ), 
-						FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );						
-				}
-				break;
-// Font Size in points (2~3276) default 20-half-points
-			case sprmOldCHps :
-				{
-					appendValueElement (parent, _T( "sz" ), 
-						FormatUtils::IntToWideString (FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize) ).c_str(),
-						true );
-				}break;
-			case sprmCHps : 
-				{  
-					appendValueElement (parent, _T( "sz" ), 
-						FormatUtils::IntToWideString (FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize) ).c_str(), true );						
-				}break;
-
-			case sprmCMajority :
-				{	//for complex props
-				}break;
-
-			case sprmOldCHpsPos: 
-				{	// The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168)
-					short nVertPos = FormatUtils::BytesToUChar(iter->Arguments, 0, iter->argumentsSize);
-					appendValueElement (parent, _T("position"), nVertPos, true);
-				}break;
-			case sprmCHpsPos: 
-				{	// The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168)
-					short nVertPos = FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize);
-					appendValueElement (parent, _T("position"), nVertPos, true);
-				}break;
-
-			case sprmOldCHpsKern:
-			case sprmCHpsKern:
-				{
-					appendValueElement( parent, _T( "kern" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
-				}break;
-
-			case sprmOldCFtc:
-			case sprmCRgFtc0:
-				{	// font family
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-					
-					if( nIndex < _doc->FontTable->Data.size() )
-					{
-						XMLTools::XMLAttribute<wchar_t>* ascii = new XMLTools::XMLAttribute<wchar_t>( _T( "w:ascii" ) );
-						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
-						m_sAsciiFont = ffn->xszFtn;
-						ascii->SetValue( FormatUtils::XmlEncode(m_sAsciiFont).c_str() );
-						rFonts->AppendAttribute( *ascii );
-						RELEASEOBJECT( ascii );
-					}
-				}break;
-
-			case sprmCRgFtc1:
-				{
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-					if( nIndex >= 0 && nIndex < _doc->FontTable->Data.size() )
-					{
-						XMLTools::XMLAttribute<wchar_t>* eastAsia = new XMLTools::XMLAttribute<wchar_t>( _T( "w:eastAsia" ) );
-						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
-						m_sEastAsiaFont = ffn->xszFtn;
-						eastAsia->SetValue( FormatUtils::XmlEncode(m_sEastAsiaFont).c_str() );
-						rFonts->AppendAttribute( *eastAsia );
-						RELEASEOBJECT( eastAsia );
-					}
-				}
-				break;
-
-			case sprmCRgFtc2:
-				{
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-					if( nIndex>=0 && nIndex < _doc->FontTable->Data.size() )
-					{
-						XMLTools::XMLAttribute<wchar_t>* ansi = new XMLTools::XMLAttribute<wchar_t>( _T( "w:hAnsi" ) );
-						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
-						m_shAnsiFont = ffn->xszFtn;
-						ansi->SetValue( FormatUtils::XmlEncode(m_shAnsiFont).c_str() );
-						rFonts->AppendAttribute( *ansi );
-						RELEASEOBJECT( ansi );
-					}
-				}break;			
-
-			case sprmOldCKul:
-			case sprmCKul:
-				{	//Underlining
-					appendValueElement( parent, _T( "u" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::UnderlineCode[0][0], 56, 16 ).c_str(), true );
-				}
-				break;		
-
-			case sprmCCharScale:
-				{	//char width
-					appendValueElement( parent, _T( "w" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
-				}break;	
-							
-			case sprmCSfxText:
-				{	//animation
-					appendValueElement( parent, _T( "effect" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextAnimation[0][0], 7, 16 ).c_str(), true );
-				}break;	
-
-			case sprmCIdctHint:
-				{
-					switch(iter->Arguments[0])
-					{
-					case 0:		break;	// default
-					case 1:		break;	// eastAsia
-					case 2:		break;	// cs
-					case 0xFF:	break;	//No ST_Hint equivalent
-					}
-
-				}break;
-
-			case sprmCPbiIBullet:
-				{
-					int nIndex = FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize );
-					if (nIndex >=0)
-					{
-						std::map<int, int>::iterator it = _doc->PictureBulletsCPsMap.find(nIndex);
-						if (it != _doc->PictureBulletsCPsMap.end())
+						if( nIndex>=0 && nIndex < _doc->FontTable->Data.size() )
 						{
-							//добавить
+							XMLTools::XMLAttribute* ansi = new XMLTools::XMLAttribute( L"w:hAnsi" );
+							FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
+							m_shAnsiFont = ffn->xszFtn;
+							ansi->SetValue( FormatUtils::XmlEncode(m_shAnsiFont));
+							rFonts->AppendAttribute( *ansi );
+							RELEASEOBJECT( ansi );
 						}
+					}break;			
+
+				case sprmOldCKul:
+				case sprmCKul:
+					{	//Underlining
+						appendValueElement( parent, L"u", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::UnderlineCode[0][0], 56, 16 ), true );
 					}
-				}break;
+					break;		
 
-			case sprmCPbiGrf:
-				{
-					//used picture bullet
-					int val = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+				case sprmCCharScale:
+					{	//char width
+						appendValueElement( parent, L"w", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
+					}break;	
+								
+				case sprmCSfxText:
+					{	//animation
+						appendValueElement( parent, L"effect", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextAnimation[0][0], 7, 16 ), true );
+					}break;	
 
-				}break;
+				case sprmCIdctHint:
+					{
+						switch(iter->Arguments[0])
+						{
+						case 0:		break;	// default
+						case 1:		break;	// eastAsia
+						case 2:		break;	// cs
+						case 0xFF:	break;	//No ST_Hint equivalent
+						}
 
-			case sprmCRsidProp:
-			case sprmCRsidText:
-				break;
+					}break;
 
-			default:
-				if (iter->argumentsSize == 2)
-				{
-					nProperty = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-				}else
-					if (iter->argumentsSize == 1)
-				{
-					nProperty = FormatUtils::BytesToUChar( iter->Arguments, 0, iter->argumentsSize );
+				case sprmCPbiIBullet:
+					{
+						int nIndex = FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize );
+						if (nIndex >=0)
+						{
+							std::map<int, int>::iterator it = _doc->PictureBulletsCPsMap.find(nIndex);
+							if (it != _doc->PictureBulletsCPsMap.end())
+							{
+								//добавить
+							}
+						}
+					}break;
+
+				case sprmCPbiGrf:
+					{
+						//used picture bullet
+						int val = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+
+					}break;
+
+				case sprmCRsidProp:
+				case sprmCRsidText:
+					break;
+
+				default:
+					if (iter->argumentsSize == 2)
+					{
+						nProperty = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+					}else
+						if (iter->argumentsSize == 1)
+					{
+						nProperty = FormatUtils::BytesToUChar( iter->Arguments, 0, iter->argumentsSize );
+					}
+					break;
 				}
-				break;
 			}
 		}
 
 		if (!m_sDefaultFont.empty() && m_sAsciiFont.empty() && m_sEastAsiaFont.empty() && m_shAnsiFont.empty())
 		{//????
-			XMLTools::XMLAttribute<wchar_t>* ascii = new XMLTools::XMLAttribute<wchar_t>( _T( "w:ascii" ) );
-			ascii->SetValue( FormatUtils::XmlEncode(m_sDefaultFont).c_str() );
+            XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( L"w:ascii" );
+			ascii->SetValue( FormatUtils::XmlEncode(m_sDefaultFont));
 			//rFonts->AppendAttribute( *ascii );
 			RELEASEOBJECT( ascii );
 		}
@@ -504,7 +507,7 @@ namespace DocFileFormat
 		}
 
 		//append color
-		if ( colorVal->GetValue() != _T( "" ) )
+        if ( colorVal->GetValue() != L"")
 		{
 			color->AppendAttribute( *colorVal );
 			parent->AppendChild( *color );
@@ -520,14 +523,14 @@ namespace DocFileFormat
 
 	/// CHPX flags are special flags because the can be 0,1,128 and 129,
 	/// so this method overrides the appendFlagElement method.
-	void CharacterPropertiesMapping::appendFlagElement( XMLTools::XMLElement<wchar_t>* node, const SinglePropertyModifier& sprm, const wchar_t* elementName, bool unique )
+    void CharacterPropertiesMapping::appendFlagElement( XMLTools::XMLElement* node, const SinglePropertyModifier& sprm, const wchar_t* elementName, bool unique )
 	{
 		unsigned char flag = sprm.Arguments[0];
 
 		if( flag != 128 )
 		{
-			XMLTools::XMLElement<wchar_t>* ele = new XMLTools::XMLElement<wchar_t>( _T( "w" ), elementName );
-			XMLTools::XMLAttribute<wchar_t>* val = new XMLTools::XMLAttribute<wchar_t>( _T( "w:val" ) );
+            XMLTools::XMLElement* ele = new XMLTools::XMLElement( L"w", elementName );
+            XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( L"w:val" );
 
 			if ( unique )
 			{
@@ -536,7 +539,7 @@ namespace DocFileFormat
 
 			if ( flag == 0 )
 			{
-				val->SetValue( _T( "false" ) );
+                val->SetValue( L"false" );
 				ele->AppendAttribute( *val );
 				node->AppendChild( *ele );
 			}
@@ -579,7 +582,7 @@ namespace DocFileFormat
 				//invert it
 				if ( stylesVal )
 				{
-					val->SetValue( _T( "false" ) );
+                    val->SetValue( L"false" );
 					ele->AppendAttribute( *val );
 				}
 

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -55,7 +55,7 @@ namespace DocFileFormat
 	{
 	public:
 		CharacterPropertiesMapping( XMLTools::CStringXmlWriter* writer, WordDocument* doc, RevisionData* rev, ParagraphPropertyExceptions* currentPapx, bool styleChpx, bool isRunStyleNeeded = true );
-		CharacterPropertiesMapping( XMLTools::XMLElement<wchar_t>* rPr, WordDocument* doc, RevisionData* rev, ParagraphPropertyExceptions* currentPapx, bool styleChpx, bool isRunStyleNeeded = true );
+        CharacterPropertiesMapping( XMLTools::XMLElement* rPr, WordDocument* doc, RevisionData* rev, ParagraphPropertyExceptions* currentPapx, bool styleChpx, bool isRunStyleNeeded = true );
 		virtual ~CharacterPropertiesMapping();
 		void Apply( IVisitable* chpx );
 		bool CheckIsSymbolFont();
@@ -63,7 +63,7 @@ namespace DocFileFormat
 		bool	_webHidden;
 		bool	_isRTL;
 	private:
-		void convertSprms( std::list<SinglePropertyModifier>* sprms, XMLTools::XMLElement<wchar_t>* parent );
+        void convertSprms( std::list<SinglePropertyModifier>* sprms, XMLTools::XMLElement* parent );
 		std::list<CharacterPropertyExceptions*> buildHierarchy( const StyleSheet* styleSheet, unsigned short istdStart );
 		bool applyToggleHierachy( const SinglePropertyModifier& sprm );
 		bool toogleValue( bool currentValue, unsigned char toggle );
@@ -71,13 +71,13 @@ namespace DocFileFormat
 	protected:
 		/// CHPX flags are special flags because the can be 0,1,128 and 129,
 		/// so this method overrides the appendFlagElement method.
-		virtual void appendFlagElement( XMLTools::XMLElement<wchar_t>* node, const SinglePropertyModifier& sprm, const wchar_t* elementName, bool unique );
+        virtual void appendFlagElement( XMLTools::XMLElement* node, const SinglePropertyModifier& sprm, const wchar_t* elementName, bool unique );
 
 	private:
 		XMLTools::CStringXmlWriter			pRunPr;
 
 		WordDocument*					_doc;
-		XMLTools::XMLElement<wchar_t>*	_rPr; 
+        XMLTools::XMLElement*           _rPr;
 		unsigned short					_currentIstd;
 		RevisionData*					_revisionData;
 		bool							_styleChpx;

ASCOfficeDocFile/DocDocxConverter/CharacterPropertyExceptions.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -35,19 +35,188 @@
 
 namespace DocFileFormat
 {
-  class CharacterPropertyExceptions: public PropertyExceptions
-  {
-    public:
-	  /// Creates a CHPX wich doesn't modify anything.
-      /// The grpprl list is empty
-      CharacterPropertyExceptions(): PropertyExceptions()
-      {
-      }
+	class CharacterPropertyExceptions: public PropertyExceptions
+	{
+		public:
+		  /// Creates a CHPX wich doesn't modify anything.
+		  /// The grpprl list is empty
+		CharacterPropertyExceptions(): PropertyExceptions()
+		{
+		}
 
-      /// Parses the bytes to retrieve a CHPX
-	  CharacterPropertyExceptions( unsigned char* bytes, int size, bool oldVersion) :
-			PropertyExceptions( bytes, size, oldVersion )
-      {
-      }
-  };
+		  /// Parses the bytes to retrieve a CHPX
+		CharacterPropertyExceptions( unsigned char* bytes, int size, int nWordVersion) :
+														PropertyExceptions( bytes, size, nWordVersion )
+		{
+			if (nWordVersion > 1)
+			{
+				RELEASEOBJECT( grpprl );
+				grpprl = new std::list<SinglePropertyModifier>();
+				
+				MemoryStream oStream(bytes, size);
+				int pos = 0;
+
+				if (nWordVersion == 3)
+				{				
+					if (pos + 2 > size) return;
+					unsigned short  fChar	= oStream.ReadUInt16(); pos += 2;
+
+					unsigned char val;
+					val = GETBIT(fChar, 0); grpprl->push_back(SinglePropertyModifier(sprmOldCFBold,		1, &val));
+					val = GETBIT(fChar, 1); grpprl->push_back(SinglePropertyModifier(sprmOldCFItalic,	1, &val));
+					val = GETBIT(fChar, 2); grpprl->push_back(SinglePropertyModifier(sprmOldCFStrike,	1, &val));
+					val = GETBIT(fChar, 3); grpprl->push_back(SinglePropertyModifier(sprmOldCFOutline,	1, &val));
+					val = GETBIT(fChar, 4); grpprl->push_back(SinglePropertyModifier(sprmOldCFFldVanish, 1, &val));
+					val = GETBIT(fChar, 5); grpprl->push_back(SinglePropertyModifier(sprmOldCFSmallCaps, 1, &val));
+					val = GETBIT(fChar, 6); grpprl->push_back(SinglePropertyModifier(sprmOldCFCaps,		1, &val));
+					val = GETBIT(fChar, 7); grpprl->push_back(SinglePropertyModifier(sprmOldCFVanish,	1, &val));
+					val = GETBIT(fChar, 8); grpprl->push_back(SinglePropertyModifier(sprmOldCFRMark,	1, &val));
+					val = GETBIT(fChar, 9); grpprl->push_back(SinglePropertyModifier(sprmOldCFSpec,		1, &val));
+
+					bool fsIco		=  GETBIT(fChar, 10);
+					bool fsFtc		=  GETBIT(fChar, 11);
+					bool fsHps		=  GETBIT(fChar, 12);
+					bool fsKul		=  GETBIT(fChar, 13);
+					bool fsPos		=  GETBIT(fChar, 14);
+					bool fsSpace	=  GETBIT(fChar, 15);
+
+					if (pos + 2 > size) return;
+					int fff = oStream.ReadUInt16();	pos += 2;//?????
+
+					if (pos + 2 > size) return;
+					unsigned short	ftc		= oStream.ReadUInt16();	pos += 2;		// Font Code
+					grpprl->push_back(SinglePropertyModifier(sprmOldCFtc, 2, (unsigned char*)&ftc));
+
+					if (pos + 1 > size) return;
+					unsigned char	hps		= oStream.ReadByte();	pos += 1;		// Font size in half points
+
+					if (hps > 0)
+					{
+						grpprl->push_back(SinglePropertyModifier(sprmOldCHps, 1, &hps));
+					}
+					
+					if (pos + 1 > size) return;
+					unsigned char   hpsPos	= oStream.ReadByte();	pos += 1;		// Sub/Superscript ( signed number, 0 = normal )
+					grpprl->push_back(SinglePropertyModifier(sprmOldCHpsPos, 1, &hpsPos));
+					
+					if (pos + 2 > size) return;
+					unsigned short  fText	= oStream.ReadUInt16();	pos += 2;
+
+					unsigned short qpsSpace = GETBITS(fText, 0, 5);
+					unsigned char wSpare2 = GETBITS(fText, 6, 7);
+					unsigned char ico = GETBITS(fText, 8, 11);
+					unsigned char kul = GETBITS(fText, 12, 14);
+					bool fSysVanish = GETBIT(fChar, 15);
+
+					grpprl->push_back(SinglePropertyModifier(sprmOldCKul,	1, &kul));
+					grpprl->push_back(SinglePropertyModifier(sprmOldCIco,	1, &ico));
+
+					//sizeof(CHP) ==  12 == 0xC
+					if (pos + 4 > size) return;
+					unsigned int	fcPic	= oStream.ReadUInt16();	pos += 4;	//pos = 8
+					grpprl->push_back(SinglePropertyModifier(sprmOldCPicLocation, 4, (BYTE*)&fcPic));
+
+					if (pos + 1 > size) return;
+					unsigned char	fnPic	= oStream.ReadByte();	pos += 1;	
+
+					if (pos + 2 > size) return;
+					unsigned short  hpsLargeChp	= oStream.ReadUInt16();	pos += 2;// ??? type
+				}
+				else if (nWordVersion == 2)
+				{
+					if (pos + 2 > size) return;
+					unsigned short  fChar	= oStream.ReadUInt16(); pos += 2;
+
+					unsigned char val;
+					val = GETBIT(fChar, 0); grpprl->push_back(SinglePropertyModifier(sprmOldCFBold,		1, &val));
+					val = GETBIT(fChar, 1); grpprl->push_back(SinglePropertyModifier(sprmOldCFItalic,	1, &val));
+					val = GETBIT(fChar, 2); grpprl->push_back(SinglePropertyModifier(sprmOldCIbstRMark,	1, &val));
+					val = GETBIT(fChar, 3); grpprl->push_back(SinglePropertyModifier(sprmOldCFOutline,	1, &val));
+					val = GETBIT(fChar, 4); grpprl->push_back(SinglePropertyModifier(sprmOldCFFldVanish, 1, &val));
+					val = GETBIT(fChar, 5); grpprl->push_back(SinglePropertyModifier(sprmOldCFSmallCaps, 1, &val));
+					val = GETBIT(fChar, 6); grpprl->push_back(SinglePropertyModifier(sprmOldCFCaps,		1, &val));
+					val = GETBIT(fChar, 7); grpprl->push_back(SinglePropertyModifier(sprmOldCFVanish,	1, &val));
+					val = GETBIT(fChar, 8); grpprl->push_back(SinglePropertyModifier(sprmOldCFRMark,	1, &val));
+					val = GETBIT(fChar, 9); grpprl->push_back(SinglePropertyModifier(sprmOldCFSpec,		1, &val));
+					val = GETBIT(fChar, 10); grpprl->push_back(SinglePropertyModifier(sprmOldCFStrike,	1, &val));
+					val = GETBIT(fChar, 11); grpprl->push_back(SinglePropertyModifier(sprmOldCFObj,		1, &val));
+					val = GETBIT(fChar, 12); grpprl->push_back(SinglePropertyModifier(sprmCFBoldBi,		1, &val));
+					val = GETBIT(fChar, 13); grpprl->push_back(SinglePropertyModifier(sprmCFItalicBi,	1, &val));
+					val = GETBIT(fChar, 14); grpprl->push_back(SinglePropertyModifier(sprmCFBiDi,		1, &val));
+					val = GETBIT(fChar, 15); grpprl->push_back(SinglePropertyModifier(sprmCFDiacColor,	1, &val));
+
+					if (pos + 2 > size) return;
+					unsigned short  fChar2 = oStream.ReadUInt16();	pos += 2;
+					bool fsIco = GETBIT(fChar2, 0);
+					bool fsFtc = GETBIT(fChar2, 1);
+					bool fsHps = GETBIT(fChar2, 2);
+					bool fsKul = GETBIT(fChar2, 3);
+					bool fsPos = GETBIT(fChar2, 4);
+					bool fsSpace = GETBIT(fChar2, 5);
+					bool fsLid = GETBIT(fChar2, 6);
+					bool fsIcoBi = GETBIT(fChar2, 7);
+					bool fsFtcBi = GETBIT(fChar2, 8);
+					bool fsHpsBi = GETBIT(fChar2, 9);
+					bool fsLidBi = GETBIT(fChar2, 10);
+
+					if (pos + 2 > size) return;
+					unsigned short	ftc		= oStream.ReadUInt16();	pos += 2;		// Font Code
+					grpprl->push_back(SinglePropertyModifier(sprmOldCFtc, 2, (unsigned char*)&ftc));
+
+					if (pos + 1 > size) return;
+					unsigned char	hps		= oStream.ReadByte();	pos += 1;		// Font size in half points
+
+					if (hps > 0)
+					{
+						grpprl->push_back(SinglePropertyModifier(sprmOldCHps, 1, &hps));
+					}
+					
+					if (pos + 1 > size) return;
+					unsigned char   hpsPos	= oStream.ReadByte();	pos += 1;		// Sub/Superscript ( signed number, 0 = normal )
+					grpprl->push_back(SinglePropertyModifier(sprmOldCHpsPos, 1, &hpsPos));
+					
+					if (pos + 2 > size) return;
+					unsigned short  fText	= oStream.ReadUInt16();	pos += 2;
+
+					unsigned short qpsSpace = GETBITS(fText, 0, 5);
+					unsigned char wSpare2 = GETBITS(fText, 6, 7);
+					unsigned char ico = GETBITS(fText, 8, 11);
+					unsigned char kul = GETBITS(fText, 12, 14);
+					bool fSysVanish = GETBIT(fChar, 15);
+
+					grpprl->push_back(SinglePropertyModifier(sprmOldCKul,	1, &kul));
+					grpprl->push_back(SinglePropertyModifier(sprmOldCIco,	1, &ico));
+
+					//if (pos + 1 > size) return;
+					//unsigned char  icoBi	= oStream.ReadUInt16();	pos += 1;//wSpare3
+					
+					if (pos + 2 > size) return;
+					unsigned short  lid	= oStream.ReadUInt16();	pos += 2;
+					grpprl->push_back(SinglePropertyModifier(sprmOldCLid, 2, (BYTE*)&lid));
+
+					if (pos + 2 > size) return;
+					unsigned short ftcBi	= oStream.ReadUInt16();	pos += 2;	
+					grpprl->push_back(SinglePropertyModifier(sprmCFtcBi, 4, (BYTE*)&ftcBi));
+					
+					//if (pos + 2 > size) return;
+					//unsigned short hpsBi	= oStream.ReadUInt16();	pos += 2;	
+					//grpprl->push_back(SinglePropertyModifier(sprmCHpsBi, 4, (BYTE*)&hpsBi));
+
+					//if (pos + 2 > size) return;
+					//unsigned short  lidBi	= oStream.ReadUInt16();	pos += 2;
+					//grpprl->push_back(SinglePropertyModifier(sprmCLidBi, 2, (BYTE*)&lidBi));
+
+					if (pos + 4 > size) return;
+					unsigned int	fcPic	= oStream.ReadUInt16();	pos += 4;	//pos = 8
+					grpprl->push_back(SinglePropertyModifier(sprmOldCPicLocation, 4, (BYTE*)&fcPic));
+
+					if (pos + 1 > size) return;
+					unsigned char	fnPic	= oStream.ReadByte();	pos += 1;	
+
+					if (pos + 2 > size) return;
+					unsigned short  hpsLargeChp	= oStream.ReadUInt16();	pos += 2;// ??? type
+				}
+			}
+		}
+	};
 }

ASCOfficeDocFile/DocDocxConverter/CharacterRange.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -54,29 +54,33 @@ namespace DocFileFormat
 
 				int index = 0; 
 
-				m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) );
-				m_pXmlWriter->WriteNodeBegin( _T( "w:comments" ), TRUE );
+                m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
+                m_pXmlWriter->WriteNodeBegin( L"w:comments", TRUE );
 
 				//write namespaces
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships );
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                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->WriteNodeEnd( L"", TRUE, FALSE );
 
 				int cp = m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr;
 
 				size_t count = m_document->AnnotationsReferencePlex->Elements.size();
-				for (unsigned int i = 0; i < count; ++i)
+				for (size_t i = 0; i < count; ++i)
 				{   
 					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
 
-					m_pXmlWriter->WriteNodeBegin( _T( "w:comment" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( index ).c_str() );
-					m_pXmlWriter->WriteAttribute( _T( "w:author" ),
-						FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->GetAuthorIndex() ) ).c_str());
-					m_pXmlWriter->WriteAttribute( _T( "w:initials" ), atrdPre10->GetUserInitials().c_str() );
+					unsigned short index_author = atrdPre10->GetAuthorIndex();
+                    m_pXmlWriter->WriteNodeBegin( L"w:comment", TRUE );
+                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 ));
+					if (index_author < m_document->AnnotationOwners->size())	//conv_253l2H1CehgKwsxCtNk__docx.doc
+					{
+						m_pXmlWriter->WriteAttribute( L"w:author",
+							FormatUtils::XmlEncode(m_document->AnnotationOwners->at( index_author ) ));
+					}
+                    m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->GetUserInitials());
 
 					//!!!TODO!!!
 					/*//ATRDpost10 is optional and not saved in all files
@@ -87,7 +91,7 @@ namespace DocFileFormat
 					atrdPost10.Date.Convert(new DateMapping(_writer));
 					}*/
 
-					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                    m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr ) < (*m_document->IndividualCommentsPlex)[index + 1] )
 					{
@@ -95,7 +99,7 @@ namespace DocFileFormat
 						if (fc < 0) break;
 
 						ParagraphPropertyExceptions* papx = findValidPapx(fc);
-						TableInfo tai(papx);
+						TableInfo tai(papx, m_document->nWordVersion);
 
 						if ( tai.fInTable )
 						{
@@ -107,16 +111,16 @@ namespace DocFileFormat
 						else
 						{
 							//this PAPX is for a normal paragraph
-							cp = writeParagraph(cp);
+							cp = writeParagraph(cp, 0x7fffffff);
 						}
 					}
 
-					m_pXmlWriter->WriteNodeEnd(_T( "w:comment" ));
+                    m_pXmlWriter->WriteNodeEnd(L"w:comment" );
 
 					++index;
 				}
 
-				m_pXmlWriter->WriteNodeEnd( _T( "w:comments" ) );
+                m_pXmlWriter->WriteNodeEnd( L"w:comments" );
 				m_context->_docx->CommentsXML = std::wstring(m_pXmlWriter->GetXmlString()); 
 			}
 		}

ASCOfficeDocFile/DocDocxConverter/ContentTypes.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -33,138 +33,143 @@
 
 #if defined(_WIN32) || defined(_WIN64)
 	#include <tchar.h>
-#else
-    #include "../../DesktopEditor/common/ASCVariant.h"
-    #include "../../Common/DocxFormat/Source/Base/ASCString.h"
 #endif
-#include <string>
+
+#include "../../DesktopEditor/common/ASCVariant.h"
 
 namespace OpenXmlContentTypes
 {
 	// default content types
-	static const TCHAR* Xml						=	_T("application/xml");
+    static const wchar_t* Xml					=	L"application/xml";
 
 	// package content types
-	static const TCHAR* Relationships			=	_T("application/vnd.openxmlformats-package.relationships+xml");
+    static const wchar_t* Relationships			=	L"application/vnd.openxmlformats-package.relationships+xml";
 
-	static const TCHAR* CoreProperties			=	_T("application/vnd.openxmlformats-package.core-properties+xml");
+    static const wchar_t* CoreProperties		=	L"application/vnd.openxmlformats-package.core-properties+xml";
 
 	// general office document content types
-	static const TCHAR* ExtendedProperties		=	_T("application/vnd.openxmlformats-officedocument.extended-properties+xml");
-	static const TCHAR* Theme					=	_T("application/vnd.openxmlformats-officedocument.theme+xml");
+    static const wchar_t* ExtendedProperties	=	L"application/vnd.openxmlformats-officedocument.extended-properties+xml";
+    static const wchar_t* Theme					=	L"application/vnd.openxmlformats-officedocument.theme+xml";
 
-	static const TCHAR* CustomXmlProperties		=	_T("application/vnd.openxmlformats-officedocument.customXmlProperties+xml");
+    static const wchar_t* CustomXmlProperties	=	L"application/vnd.openxmlformats-officedocument.customXmlProperties+xml";
 
-	static const TCHAR* OleObject				=	_T("application/vnd.openxmlformats-officedocument.oleObject");
-	static const TCHAR* Vml						=	_T("application/vnd.openxmlformats-officedocument.vmlDrawing");
-	static const TCHAR* Drawing					=	_T("application/vnd.openxmlformats-officedocument.drawing+xml");
+    static const wchar_t* OleObject				=	L"application/vnd.openxmlformats-officedocument.oleObject";
+    static const wchar_t* Vml					=	L"application/vnd.openxmlformats-officedocument.vmlDrawing";
+    static const wchar_t* Drawing				=	L"application/vnd.openxmlformats-officedocument.drawing+xml";
 	
-	static const TCHAR* MSWordDocx				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+    static const wchar_t* MSWordDocx			=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.document";
 
-	static const TCHAR* MSExcel					=	_T("application/vnd.ms-excel");
-	static const TCHAR* MSWord					=	_T("application/msword");
-	static const TCHAR* MSPowerpoint			=	_T("application/vnd.ms-powerpoint");
+    static const wchar_t* MSExcel				=	L"application/vnd.ms-excel";
+    static const wchar_t* MSWord				=	L"application/msword";
+    static const wchar_t* MSPowerpoint			=	L"application/vnd.ms-powerpoint";
 
-	static const TCHAR* Emf						=	_T("image/x-emf");
-	static const TCHAR* Jpeg					=	_T("image/jpeg");
-	static const TCHAR* Png						=	_T("image/png");
-	static const TCHAR* Tiff					=	_T("image/tiff");
-	static const TCHAR* Wmf						=	_T("image/x-wmf");
-	static const TCHAR* Bmp						=	_T("image/bmp");
+    static const wchar_t* Emf					=	L"image/x-emf";
+    static const wchar_t* Jpeg					=	L"image/jpeg";
+    static const wchar_t* Png					=	L"image/png";
+    static const wchar_t* Tiff					=	L"image/tiff";
+    static const wchar_t* Wmf					=	L"image/x-wmf";
+    static const wchar_t* Bmp					=	L"image/bmp";
+	static const wchar_t* Pcz					=	L"image/x-pcz";
+}
+namespace DocPrContentTypes
+{
+    static const wchar_t* App			=	L"application/vnd.openxmlformats-officedocument.extended-properties+xml";
+    static const wchar_t* Core			=	L"application/vnd.openxmlformats-package.core-properties+xml";
 }
-
 namespace WordprocessingMLContentTypes
 {
 	// WordprocessingML content types
-	static const TCHAR* MainDocument			=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml");
-	static const TCHAR* MainDocumentMacro		=	_T("application/vnd.ms-word.document.macroEnabled.main+xml");
-	static const TCHAR* MainDocumentTemplate	=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml");
-	static const TCHAR* MainDocumentMacroTemplate =	_T("application/vnd.ms-word.template.macroEnabledTemplate.main+xml");
+    static const wchar_t* MainDocument			=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml";
+    static const wchar_t* MainDocumentMacro		=	L"application/vnd.ms-word.document.macroEnabled.main+xml";
+    static const wchar_t* MainDocumentTemplate	=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml";
+    static const wchar_t* MainDocumentMacroTemplate =	L"application/vnd.ms-word.template.macroEnabledTemplate.main+xml";
 
-	static const TCHAR* Styles					=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml");
-	static const TCHAR* Numbering				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml");
-	static const TCHAR* FontTable				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml");
-	static const TCHAR* WebSettings				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml");
-	static const TCHAR* Settings				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml");
+    static const wchar_t* Styles				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml";
+    static const wchar_t* Numbering				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml";
+    static const wchar_t* FontTable				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml";
+    static const wchar_t* WebSettings			=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml";
+    static const wchar_t* Settings				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml";
 
-	static const TCHAR* Comments				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml");
+    static const wchar_t* Comments				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml";
 
-	static const TCHAR* Footnotes				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"); 
-	static const TCHAR* Endnotes				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+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";
 
-	static const TCHAR* Header					=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml");
-	static const TCHAR* Footer					=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml");
+    static const wchar_t* Header				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml";
+    static const wchar_t* Footer				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml";
 
-	static const TCHAR* Glossary				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml");
+    static const wchar_t* Glossary				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml";
 }
 
 namespace MicrosoftWordContentTypes
 {
-	static const TCHAR* KeyMapCustomization		=	_T("application/vnd.ms-word.keyMapCustomizations+xml");
-	static const TCHAR* VbaProject				=	_T("application/vnd.ms-office.vbaProject");
-	static const TCHAR* VbaData					=	_T("application/vnd.ms-word.vbaData+xml");
-	static const TCHAR* Toolbars				=	_T("application/vnd.ms-word.attachedToolbars");
+    static const wchar_t* KeyMapCustomization	=	L"application/vnd.ms-word.keyMapCustomizations+xml";
+    static const wchar_t* VbaProject			=	L"application/vnd.ms-office.vbaProject";
+    static const wchar_t* VbaData				=	L"application/vnd.ms-word.vbaData+xml";
+    static const wchar_t* Toolbars				=	L"application/vnd.ms-word.attachedToolbars";
 }
 
 namespace OpenXmlNamespaces
 {
 	// package namespaces
-	static const TCHAR* ContentTypes			=	_T("http://schemas.openxmlformats.org/package/2006/content-types");
-	static const TCHAR* RelationshipsPackage	=	_T("http://schemas.openxmlformats.org/package/2006/relationships");
-	static const TCHAR* Relationships			=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+    static const wchar_t* ContentTypes			=	L"http://schemas.openxmlformats.org/package/2006/content-types";
+    static const wchar_t* RelationshipsPackage	=	L"http://schemas.openxmlformats.org/package/2006/relationships";
+    static const wchar_t* Relationships			=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships";
 
 	// Drawing ML namespaces
-	static const TCHAR* DrawingML				=	_T("http://schemas.openxmlformats.org/drawingml/2006/main");
-	static const TCHAR* DrawingMLPicture		=	_T("http://schemas.openxmlformats.org/drawingml/2006/picture");
+    static const wchar_t* DrawingML				=	L"http://schemas.openxmlformats.org/drawingml/2006/main";
+    static const wchar_t* DrawingMLPicture		=	L"http://schemas.openxmlformats.org/drawingml/2006/picture";
 
 	// WordprocessingML namespaces
-	static const TCHAR* WordprocessingML		=	_T("http://schemas.openxmlformats.org/wordprocessingml/2006/main");
-	static const TCHAR* WordprocessingDrawingML =	_T("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
-	static const TCHAR* VectorML				=	_T("urn:schemas-microsoft-com:vml");
-	static const TCHAR* MicrosoftWordML			=	_T("http://schemas.microsoft.com/office/word/2006/wordml");
+    static const wchar_t* WordprocessingML		=	L"http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+    static const wchar_t* WordprocessingDrawingML =	L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing";
+    static const wchar_t* VectorML				=	L"urn:schemas-microsoft-com:vml";
+    static const wchar_t* MicrosoftWordML		=	L"http://schemas.microsoft.com/office/word/2006/wordml";
 
 	// PresentationML namespaces
-	static const TCHAR* PresentationML			=	_T("http://schemas.openxmlformats.org/presentationml/2006/main");
+    static const wchar_t* PresentationML		=	L"http://schemas.openxmlformats.org/presentationml/2006/main";
 
 	// SpreadsheetML Namespaces
-	static const TCHAR* SharedStringML			=	_T("http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-	static const TCHAR* WorkBookML				=	_T("http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-	static const TCHAR* StylesML				=	_T("http://schemas.openxmlformats.org/spreadsheetml/2006/main"); 
+    static const wchar_t* SharedStringML		=	L"http://schemas.openxmlformats.org/spreadsheetml/2006/main";
+    static const wchar_t* WorkBookML			=	L"http://schemas.openxmlformats.org/spreadsheetml/2006/main";
+    static const wchar_t* StylesML				=	L"http://schemas.openxmlformats.org/spreadsheetml/2006/main";
 
 	//Office
-	static const TCHAR* Office					=	_T("urn:schemas-microsoft-com:office:office");
-	static const TCHAR* OfficeWord				=	_T("urn:schemas-microsoft-com:office:word");
+    static const wchar_t* Office				=	L"urn:schemas-microsoft-com:office:office";
+    static const wchar_t* OfficeWord			=	L"urn:schemas-microsoft-com:office:word";
 }
 
 namespace OpenXmlRelationshipTypes
 {
-	static const TCHAR* CoreProperties			=	_T("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties");
-	static const TCHAR* ExtendedProperties		=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties");
+	static const wchar_t* CoreProperties		=	L"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
+    static const wchar_t* ExtendedProperties	=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";
 
-	static const TCHAR* Theme					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme");
-	static const TCHAR* OfficeDocument			=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument");
-	static const TCHAR* Styles					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles");
-	static const TCHAR* FontTable				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable");
-	static const TCHAR* Numbering				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"); 
-	static const TCHAR* WebSettings				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings");
-	static const TCHAR* Settings				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings");
-	static const TCHAR* CustomXml				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml");
-	static const TCHAR* CustomXmlProperties		=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps");
-	static const TCHAR* Comments				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments");
-	static const TCHAR* Footnotes				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes");
-	static const TCHAR* Endnotes				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes");
-	static const TCHAR* Header					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/header");
-	static const TCHAR* Footer					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer");
-	static const TCHAR* Image					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/image");
-	static const TCHAR* OleObject				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject");
-	static const TCHAR* GlossaryDocument		=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument");
-	static const TCHAR* Package					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/package");
+    static const wchar_t* Theme					=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme";
+    static const wchar_t* OfficeDocument		=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";
+    static const wchar_t* Styles				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles";
+    static const wchar_t* FontTable				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable";
+    static const wchar_t* Numbering				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering";
+    static const wchar_t* WebSettings			=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings";
+    static const wchar_t* Settings				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings";
+    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* 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";
+    static const wchar_t* Footer				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer";
+    static const wchar_t* Image					=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
+    static const wchar_t* OleObject				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
+    static const wchar_t* GlossaryDocument		=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument";
+    static const wchar_t* Package				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
+    static const wchar_t* VbaProject			=	L"http://schemas.microsoft.com/office/2006/relationships/vbaProject";
+	static const wchar_t* Hyperlink				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
 }
 
 namespace MicrosoftWordRelationshipTypes
 {
-	static const TCHAR* KeyMapCustomizations	=	_T("http://schemas.microsoft.com/office/2006/relationships/keyMapCustomizations");
-	static const TCHAR* VbaProject				=	_T("http://schemas.microsoft.com/office/2006/relationships/vbaProject");
-	static const TCHAR* VbaData					=	_T("http://schemas.microsoft.com/office/2006/relationships/wordVbaData");
-	static const TCHAR* Toolbars				=	_T("http://schemas.microsoft.com/office/2006/relationships/attachedToolbars");
+    static const wchar_t* KeyMapCustomizations	=	L"http://schemas.microsoft.com/office/2006/relationships/keyMapCustomizations";
+    static const wchar_t* VbaProject			=	L"http://schemas.microsoft.com/office/2006/relationships/vbaProject";
+    static const wchar_t* VbaData				=	L"http://schemas.microsoft.com/office/2006/relationships/wordVbaData";
+    static const wchar_t* Toolbars				=	L"http://schemas.microsoft.com/office/2006/relationships/attachedToolbars";
 }

ASCOfficeDocFile/DocDocxConverter/ConversionContext.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -47,30 +47,17 @@ namespace DocFileFormat
 
 		virtual ~ConversionContext()
 		{
-
 		}
 
-		// Adds a new RSID to the set
 		inline void AddRsid(const std::wstring& rsid)
 		{
 			if (AllRsids.find(rsid) == AllRsids.end())
 				AllRsids.insert(rsid);
 		}
 
-		inline WordDocument* GetDocument()
-		{
-			return _doc;
-		}
-
-		inline WordprocessingDocument* GetXmlDocument()
-		{
-			return _docx;
-		}
-	
-	public:
 		WordprocessingDocument*		_docx;	
 		WordDocument*				_doc;	
-		/// A set thta contains all revision ids.
+
 		std::set<std::wstring>		AllRsids;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -63,9 +63,17 @@ namespace DocFileFormat
 {
 	long Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
 	{
+		if (!doc || !docx) return S_FALSE;
+		
 		ConversionContext context( doc, docx );
 
-		//Write styles.xml
+	//Write fontTable.xml
+		if (doc->FontTable)
+		{
+			FontTableMapping fontTableMapping( &context );
+			doc->FontTable->Convert( &fontTableMapping );
+		}
+	//Write styles.xml
 		if (doc->Styles)
 		{
 			StyleSheetMapping styleSheetMapping( &context );
@@ -88,9 +96,7 @@ namespace DocFileFormat
 				return S_FALSE;
 			}
 		}
-
-
-		//Write numbering.xml
+	//Write numbering.xml
 		if (doc->listTable)
 		{
 			NumberingMapping numberingMapping( &context );
@@ -109,14 +115,6 @@ namespace DocFileFormat
 				return S_FALSE;
 			}
 		}
-
-		//Write fontTable.xml
-		if (doc->FontTable)
-		{
-			FontTableMapping fontTableMapping( &context );
-			doc->FontTable->Convert( &fontTableMapping );
-		}
-
 		if ( progress != NULL )
 		{
 			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 875000 );
@@ -130,7 +128,7 @@ namespace DocFileFormat
 			}
 		}
 
-		//write the footnotes
+	//write the footnotes
 		FootnotesMapping footnotesMapping( &context );
 		doc->Convert( &footnotesMapping );
 
@@ -147,7 +145,7 @@ namespace DocFileFormat
 			}
 		}
 
-		//write the endnotes
+	//write the endnotes
 		EndnotesMapping endnotesMapping( &context );
 		doc->Convert( &endnotesMapping );
 
@@ -164,7 +162,7 @@ namespace DocFileFormat
 			}
 		}
 
-		//write the comments
+	//write the comments
 		CommentsMapping commentsMapping( &context );
 		doc->Convert( &commentsMapping );
 
@@ -181,13 +179,13 @@ namespace DocFileFormat
 			}
 		}
 
-		//write settings.xml at last because of the rsid list
+	//write settings.xml at last because of the rsid list
 		if (doc->DocProperties)
 		{
 			SettingsMapping settingsMapping( &context );
 			doc->DocProperties->Convert( &settingsMapping );
 		}
-
+		
 		if ( progress != NULL )
 		{
 			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 975000 );
@@ -204,7 +202,7 @@ namespace DocFileFormat
 		return S_OK;
 	}
 
-	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress)
+	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
 	{
         long result = S_FALSE;
 
@@ -219,7 +217,7 @@ namespace DocFileFormat
 
             if (result == S_OK)
 			{
-				docx.SaveDocument();
+				docx.SaveDocument(bMacros);
 
                 if (progress)progress->OnProgress(progress->caller, DOC_ONPROGRESSEVENT_ID, 1000000);
 

ASCOfficeDocFile/DocDocxConverter/Converter.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -48,7 +48,7 @@ namespace DocFileFormat
 
 		std::wstring m_sTempFolder;
 
-		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress);
+		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
 	
 	private:
 		long Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	

ASCOfficeDocFile/DocDocxConverter/DateAndTime.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -59,29 +59,30 @@ namespace DocFileFormat
       short wdy;
 
     public:
-      /// Creates a new DateAndTime with default values
-      DateAndTime()
-      {
-        setDefaultValues();
-      }
-
-      /// Parses the unsigned char sto retrieve a DateAndTime
-      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 );
-        }
-        else
-        {
-          //throw new ByteParseException("Cannot parse the struct DTTM, the length of the struct doesn't match");
-        }
-      }
+		DateAndTime()
+		{
+			setDefaultValues();
+		}
+		DateAndTime( unsigned int val )
+		{
+			DateAndTime((unsigned char*)&val, 4);
+		}
+		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 );
+			}
+			else
+			{
+			  //throw new ByteParseException("Cannot parse the struct DTTM, the length of the struct doesn't match");
+			}
+		}
 #if defined(_WIN32) || defined(_WIN64)
 	  SYSTEMTIME ToSYSTEMTIME()
       {

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -48,6 +48,8 @@
 #include "OleObjectMapping.h"
 #include "ConversionContext.h"
 #include "IMapping.h"
+#include "FormFieldData.h"
+#include "FormFieldDataMapping.h"
 
 namespace DocFileFormat
 {
@@ -70,73 +72,83 @@ namespace DocFileFormat
 	public:
 		DocumentMapping(ConversionContext* context, IMapping* caller);
 		DocumentMapping(ConversionContext* context, XMLTools::CStringXmlWriter* writer, IMapping* caller);
+		
 		virtual ~DocumentMapping();
 		virtual void Apply( IVisitable* visited ) = 0;
 
+//--------------------------------- 4571833.doc
+		std::wstring	m_shapeIdOwner;
+		std::wstring	getOLEObject() { return _lastOLEObject; }
 	protected:
 
-		/// Looks into the section table to find out if this CP is the current of a section
-		int getCurrentSection(int cp);
-		/// Looks into the section table to find out if this CP is the end of a section
-		bool isSectionEnd( int cp );
-		/// Writes a Paragraph that starts at the given cp and 
-		/// ends at the next paragraph end mark or section end mark
-		int writeParagraph( int cp ); 
-		/// Writes a Paragraph that starts at the given cpStart and 
-		/// ends at the given cpEnd
+		int getListNumCache		(int fc, int fc_end);
+		int getCurrentSection	(int cp);
+//---------------------------------
+		bool isSectionEnd		( int cp );
+	// Writes a Paragraph that starts at the given cp and 
+	// ends at the next paragraph end mark or section end mark
+		int writeParagraph( int cp, int cpEnd ); 
+	// Writes a Paragraph that starts at the given cpStart and 
+	// ends at the given cpEnd
 		int writeParagraph( int initialCp, int cpEnd, bool sectionEnd, bool lastBad = false );
-		/// Writes a Paragraph RSID
+	// Writes a Paragraph RSID
 		void writeParagraphRsid( const ParagraphPropertyExceptions* papx );
-		/// Writes a run with the given characters and CHPX
+	// Writes a run with the given characters and CHPX
 		int writeRun( std::vector<wchar_t>* chars, CharacterPropertyExceptions* chpx, int initialCp );
-		/// Writes the given text to the document
+	// Writes the given text to the document	
+		int	 writeText			( std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText );
+		void writeTextElement	( const std::wstring& text, const std::wstring& textType );
+        void writeTextStart		( const std::wstring& textType, bool preserve_space);
+		void writeTextEnd		( const std::wstring& textType );
 		
-		int	 writeText( std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText );
-		void writeTextElement( const std::wstring& text, const std::wstring& textType );
-        void writeTextStart( const std::wstring& textType, bool preserve_space);
-		void writeTextEnd( const std::wstring& textType );
-		
-		/// Searches for bookmarks in the list of characters.
 		std::vector<int> searchBookmarks( std::vector<wchar_t>* chars, int initialCp );
+		std::vector<int> searchAnnot(std::vector<wchar_t>* chars, int initialCp);
+
 		ParagraphPropertyExceptions* findValidPapx( int fc );
-		/// Splits a list of characters into several lists
+	// Splits a list of characters into several lists
 		std::list<std::vector<wchar_t> >* splitCharList( std::vector<wchar_t>* chars, std::vector<int>* splitIndices );
-		/// Writes the table starts at the given cp value
-		int writeTable( int initialCp, unsigned int nestingLevel );
-		/// Builds a list that contains the width of the several columns of the table.
-		std::vector<short>* buildTableGrid( int initialCp, unsigned int nestingLevel );
-		/// Finds the FC of the next row end mark.
-		int findRowEndFc( int initialCp, int& rowEndCp, unsigned int nestingLevel );
-		/// Finds the FC of the next row end mark.
-		int findRowEndFc( int initialCp, unsigned int nestingLevel );
-		/// Writes the table row that starts at the given cp value and ends at the next row end mark
-		int writeTableRow( int initialCp, std::vector<short>* grid, unsigned int nestingLevel );
-		/// Writes the table cell that starts at the given cp value and ends at the next cell end mark
-		int writeTableCell( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel );
-		int findCellEndCp( int initialCp, unsigned int nestingLevel );
-		bool writeBookmarks( int cp );
-		bool writeBookmarkStart( short id );
-		bool writeBookmarkEnd( short id );
-		/// Checks if the CHPX is special
+	// Writes the table starts at the given cp value
+		int writeTable		( int initialCp, unsigned int nestingLevel );
+	// Builds a list that contains the width of the several columns of the table.
+		bool buildTableGrid( int initialCp, unsigned int nestingLevel, std::vector<short>& grid);
+	// Finds the FC of the next row end mark.
+		int findRowEndFc		( int initialCp, int& rowEndCp, unsigned int nestingLevel );
+	// Finds the FC of the next row end mark.
+		int findRowEndFc		( int initialCp, unsigned int nestingLevel );
+	// Writes the table row that starts at the given cp value and ends at the next row end mark
+		int writeTableRow		( int initialCp, std::vector<short>* grid, unsigned int nestingLevel );
+	// Writes the table cell that starts at the given cp value and ends at the next cell end mark
+		int writeTableCell		( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel );
+		int findCellEndCp		( int initialCp, unsigned int nestingLevel );
+		
+		bool writeBookmarks		( int cp );
+		bool writeBookmarkStart	( short id );
+		bool writeBookmarkEnd	( short id );
+
+		bool writeAnnotations	( int cp );
+		bool writeAnnotationStart( short id );
+		bool writeAnnotationEnd	( short id );
+	// Checks if the CHPX is special
 		bool isSpecial( CharacterPropertyExceptions* chpx );
-		/// Finds the SEPX that is valid for the given CP.
+	// Finds the SEPX that is valid for the given CP.
 		SectionPropertyExceptions* findValidSepx( int cp );
-		/// Searches the given vector for the next FieldEnd character.
+	// Searches the given vector for the next FieldEnd character.
 		int searchNextTextMark( std::vector<wchar_t>* chars, int initialCp, wchar_t mark );
+		Symbol	getSymbol ( const CharacterPropertyExceptions* chpx );
 
-	private:
-		Symbol getSymbol( const CharacterPropertyExceptions* chpx );
+		void AddBoundary(short boundary1, short boundary2, std::map<short, short> &boundaries);
+//----------------------------------------------------------------------------------------------------------------------
 		bool							m_bInternalXmlWriter; 
 
-	protected:
-
 		WordDocument*					m_document;
 		ConversionContext*				m_context;
+		
 		IMapping*						_caller;
 		
 		ParagraphPropertyExceptions*	_lastValidPapx;
 		SectionPropertyExceptions*		_lastValidSepx;
 
+		bool							_embeddedObject;
 		int								_skipRuns;
 		int								_sectionNr;
 		int								_footnoteNr;
@@ -144,9 +156,19 @@ namespace DocFileFormat
 		int								_commentNr;
 		bool							_isTextBoxContent;
 		int								_isSectionPageBreak; //0 - not set, 1 -page break, 2 - continues
-		bool							_writeInstrText;
 		bool							_writeWebHidden;
-		unsigned int					_fldCharCounter;
 		std::wstring					_writeAfterRun;
+		std::wstring					_lastOLEObject;
+		int								_cacheListNum;
+		
+		struct fieldLevels
+		{
+			bool bBegin = false;
+			bool bSeparate = false;
+			//bool bInstrText = false;
+			bool bEnd = false;
+		};
+		std::vector<fieldLevels>		_fieldLevels;
+		bool							_bContentWrite;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/DocumentProperties.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -43,26 +43,94 @@ namespace DocFileFormat
 
 		/*========================================================================================================*/
 		
-	WordDocumentProperties::WordDocumentProperties(FileInformationBlock* fib, POLE::Stream* tableStream) : doptypography(NULL), dogrid(NULL), asumyi(NULL)
+	WordDocumentProperties::WordDocumentProperties(FileInformationBlock* fib, POLE::Stream* tableStream) : 
+			doptypography(NULL), dogrid(NULL), asumyi(NULL), bDisplayBackgroundShape(false)
 	{
 		Initialize();
 		
-		VirtualStreamReader tStream( tableStream, fib->m_FibWord97.fcDop, fib->m_bOlderVersion);
+		VirtualStreamReader tStream( tableStream, fib->m_FibWord97.fcDop, fib->m_nWordVersion);
 		
 //setDefaultCompatibilityOptions( fib->m_FibBase.nFib );
 
-		unsigned int size		= fib->m_FibWord97.lcbDop;
-		unsigned char* bytes	= tStream.ReadBytes( size, true );
+		unsigned int size = fib->m_FibWord97.lcbDop;
+		unsigned char* bytes = NULL;
 
         try
         {
-            if ( size > 0 )
+			if (fib->m_nWordVersion == 2)	
+			{
+				unsigned char* Temp = tStream.ReadBytes(size, true);
+				tStream.Seek(fib->m_FibWord97.fcDop, 0);
+				delete []Temp;
+
+				unsigned char flags1 = tStream.ReadByte();
+				
+				fFacingPages	= GETBIT(flags1, 0);
+				fWindowControl	= GETBIT(flags1, 1);
+				Fpc				= GETBITS(flags1, 5, 6);
+				bool fWide		= GETBIT(flags1, 7);
+				
+				grpfIhdt		= tStream.ReadByte();
+				
+				unsigned short flags2 = tStream.ReadUInt16();
+				rncFtn			= GETBIT(flags2, 0);
+				nFtn			= GETBITS(flags2, 1, 15);
+
+				unsigned char irmBar	= tStream.ReadByte();
+
+				unsigned char flags3	= tStream.ReadByte();
+				unsigned char irmProps	= GETBITS(flags3, 0, 6);
+				fRevMarking				= GETBIT(flags3, 7);
+				
+				unsigned short flags4 = tStream.ReadUInt16();
+				fBackup			= GETBIT(flags4, 0);
+				fExactWords		= GETBIT(flags4, 1);
+				fPagHidden		= GETBIT(flags4, 2);
+				fPagResults		= GETBIT(flags4, 3);
+				fLockAtn		= GETBIT(flags4, 4);
+				fMirrorMargins	= GETBIT(flags4, 5);
+				bool fKeepFileFormat	= GETBIT(flags4, 6);
+				fDflttrueType	= GETBIT(flags4, 7);
+
+				fPagSuppressTopSpacing	= GETBIT(flags4, 8);
+				fMaybeRTLTables			= GETBIT(flags4, 9);
+
+				bool fSpares = tStream.ReadUInt16();
+				dxaTab = tStream.ReadUInt16();
+
+				wSpare = tStream.ReadUInt16();//ftcDefaultBi
+				dxaHotZ = tStream.ReadUInt16();
+
+				wSpare2 = tStream.ReadUInt16();
+				wSpare3 = tStream.ReadUInt16();
+				
+                dttmCreated = DateAndTime( tStream.ReadUInt32() );
+				dttmRevised = DateAndTime( tStream.ReadUInt32() );
+				dttmLastPrint = DateAndTime( tStream.ReadUInt32() );
+				
+				nRevision = tStream.ReadUInt16();
+				tmEdited = tStream.ReadUInt32();
+
+				cWords = tStream.ReadUInt32();
+				cCh = tStream.ReadUInt32();
+				cPg = tStream.ReadUInt16();
+
+				unsigned short rgwSpareDocSum[2];
+				rgwSpareDocSum[0] = tStream.ReadUInt16();
+				rgwSpareDocSum[1] = tStream.ReadUInt16();
+
+			}
+            else if ( size > 0 )
             {
-                fFacingPages	= FormatUtils::GetBitFromBytes( bytes, 2, 0 );
+				bytes	= tStream.ReadBytes( size, true );
+               
+				fFacingPages	= FormatUtils::GetBitFromBytes( bytes, 2, 0 );
                 fWindowControl	= FormatUtils::GetBitFromBytes( bytes, 2, 1 );
                 fPMHMainDoc		= FormatUtils::GetBitFromBytes( bytes, 2, 2 );
                 grfSuppression	= (short)FormatUtils::GetUIntFromBytesBits( bytes, 2, 3, 2 );
-                Fpc				= (short)(short)FormatUtils::GetUIntFromBytesBits( bytes, 2, 5, 2 );
+                Fpc				= (short)FormatUtils::GetUIntFromBytesBits( bytes, 2, 5, 2 );
+
+				grpfIhdt		= FormatUtils::BytesToUChar( bytes, 1, size );
 
                 rncFtn			= (short)FormatUtils::GetUIntFromBytesBits( ( bytes + 2 ), 2, 0, 2 );
                 nFtn			= (short)FormatUtils::GetUIntFromBytesBits( ( bytes + 2 ), 2, 2, 14 );
@@ -226,7 +294,7 @@ namespace DocFileFormat
                         dywDispPag	= FormatUtils::BytesToInt16( bytes, 498, size );
 
 //WORD 2000, 2002, 2003 PART
-                        if ( size > 500 )
+                        if ( size > 500/* && fib->m_FibNew.nFibNew > Fib1997*/)
                         {
                             ilvlLastBulletMain	= bytes[500];
                             ilvlLastNumberMain	= bytes[501];
@@ -266,138 +334,158 @@ namespace DocFileFormat
                             fDntULTrlSpc				= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 14 );
                             fDntBlnSbDbWid				= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 15 );
                             fSuppressTopSpacingMac5		= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 16 );
-                            fTruncDxaExpand = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 17 );
-                            fPrintBodyBeforeHdr = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 18 );
-                            fNoLeading = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 19 );
-                            fMakeSpaceForUL = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 20 );
-                            fMWSmallCaps = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 21 );
-                            f2ptExtLeadingOnly = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 22 );
-                            fTruncFontHeight = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 23 );
-                            fSubOnSize = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 24 );
-                            fLineWrapLikeWord6 = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 25 );
-                            fWW6BorderRules = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 26 );
-                            fExactOnTop = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 27 );
-                            fExtraAfter = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 28 );
-                            fWPSpace = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 29 );
-                            fWPJust = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 30 );
-                            fPrintMet = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 31 );
+                            fTruncDxaExpand				= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 17 );
+                            fPrintBodyBeforeHdr			= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 18 );
+                            fNoLeading					= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 19 );
+                            fMakeSpaceForUL				= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 20 );
+                            fMWSmallCaps				= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 21 );
+                            f2ptExtLeadingOnly			= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 22 );
+                            fTruncFontHeight			= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 23 );
+                            fSubOnSize					= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 24 );
+                            fLineWrapLikeWord6			= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 25 );
+                            fWW6BorderRules				= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 26 );
+                            fExactOnTop					= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 27 );
+                            fExtraAfter					= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 28 );
+                            fWPSpace					= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 29 );
+                            fWPJust						= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 30 );
+                            fPrintMet					= FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 31 );
 
-                            //split bytes 512,513,514,515 into bits
-                            fSpLayoutLikeWW8 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 0 );
-                            fFtnLayoutLikeWW8 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 1 );
-                            fDontUseHTMLParagraphAutoSpacing = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 2 );
-                            fDontAdjustLineHeightInTable = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 3 );
-                            fForgetLastTabAlign = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 4 );
-                            fUseAutoSpaceForFullWidthAlpha = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 5 );
-                            fAlignTablesRowByRow = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 6 );
-                            fLayoutRawTableWidth = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 7 );
-                            fLayoutTableRowsApart = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 8 );
-                            fUserWord97LineBreakingRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 9 );
-                            fDontBreakWrappedTables = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 10 );
-                            fDontSnapToGridInCell = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 11 );
-                            fDontAllowFieldEndSelect = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 12 );
-                            fApplyBreakingRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 13 );
-                            fDontWrapTextWithPunct = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 14 );
-                            fDontUseAsianBreakRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 15 );
-                            fUseWord2002TableStyleRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 16 );
-                            fGrowAutofit = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 17 );
-                            fUseNormalStyleForList = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 18 );
-                            fDontUseIndentAsNumberingTabStop = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 19 );
-                            fFELineBreak11 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 20 );
-                            fAllowSpaceOfSameStyleInTable = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 21 );
-                            fWW11IndentRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 22 );
-                            fDontAutofitConstrainedTables = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 23 );
-                            fAutofitLikeWW11 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 24 );
-                            fUnderlineTabInNumList = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 25 );
-                            fHangulWidthLikeWW11 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 26 );
-                            fSplitPgBreakAndParaMark = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 27 );
-                            fDontVertAlignCellWithSp = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 28 );
-                            fDontBreakConstrainedForcedTables = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 29 );
-                            fDontVertAlignInTxbx = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 30 );
-                            fWord11KerningPairs = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 31 );
-                            fCachedColBalance = FormatUtils::GetBitFromBytes( ( bytes + 516 ), 4, 0 );
+                      //split bytes 512,513,514,515 into bits
+                            fSpLayoutLikeWW8					= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 0 );
+                            fFtnLayoutLikeWW8					= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 1 );
+                            fDontUseHTMLParagraphAutoSpacing	= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 2 );
+                            fDontAdjustLineHeightInTable		= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 3 );
+                            fForgetLastTabAlign					= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 4 );
+                            fUseAutoSpaceForFullWidthAlpha		= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 5 );
+                            fAlignTablesRowByRow				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 6 );
+                            fLayoutRawTableWidth				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 7 );
+                            fLayoutTableRowsApart				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 8 );
+                            fUserWord97LineBreakingRules		= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 9 );
+                            fDontBreakWrappedTables				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 10 );
+                            fDontSnapToGridInCell				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 11 );
+                            fDontAllowFieldEndSelect			= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 12 );
+                            fApplyBreakingRules					= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 13 );
+                            fDontWrapTextWithPunct				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 14 );
+                            fDontUseAsianBreakRules				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 15 );
+                            fUseWord2002TableStyleRules			= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 16 );
+                            fGrowAutofit						= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 17 );
+                            fUseNormalStyleForList				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 18 );
+                            fDontUseIndentAsNumberingTabStop	= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 19 );
+                            fFELineBreak11						= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 20 );
+                            fAllowSpaceOfSameStyleInTable		= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 21 );
+                            fWW11IndentRules					= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 22 );
+                            fDontAutofitConstrainedTables		= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 23 );
+                            fAutofitLikeWW11					= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 24 );
+                            fUnderlineTabInNumList				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 25 );
+                            fHangulWidthLikeWW11				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 26 );
+                            fSplitPgBreakAndParaMark			= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 27 );
+                            fDontVertAlignCellWithSp			= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 28 );
+                            fDontBreakConstrainedForcedTables	= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 29 );
+                            fDontVertAlignInTxbx				= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 30 );
+                            fWord11KerningPairs					= FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 31 );
+
+                            fCachedColBalance			= FormatUtils::GetBitFromBytes( ( bytes + 516 ), 4, 0 );
                             
-                            //bytes 517-539 are unused
+                            //bytes 517-539 are unused 
 
-                            verCompatPreW10		= (unsigned short)FormatUtils::GetUIntFromBytesBits( ( bytes + 540 ), 4, 0, 16 );
-                            fNoMargPgvwSaved	= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 16 );
-                            fNoMargPgvWPag		= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 17 );
-                            fWebViewPag			= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 18 );
-                            fSeeDrawingsPag		= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 19 );
-                            fBulletProofed		= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 20 );
-                            fCorrupted			= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 21 );
-                            fSaveUim			= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 22 );
-                            fFilterPrivacy		= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 23 );
-                            fInFReplaceNoRM		= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 24 );
-                            fSeenRepairs = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 25 );
-                            fHasXML = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 26 );
-                            fSeeScriptAnchorsPag = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 27 );
-                            fValidateXML = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 28 );
-                            fSaveIfInvalidXML = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 29 );
-                            fShowXMLErrors = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 30 );
-                            fAlwaysMergeEmptyNamespace = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 31 );
+                            verCompatPreW10				= (unsigned short)FormatUtils::GetUIntFromBytesBits( ( bytes + 540 ), 4, 0, 16 );
+                            fNoMargPgvwSaved			= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 16 );
+                            fNoMargPgvWPag				= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 17 );
+                            fWebViewPag					= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 18 );
+                            fSeeDrawingsPag				= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 19 );
+                            fBulletProofed				= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 20 );
+                            fCorrupted					= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 21 );
+                            fSaveUim					= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 22 );
+                            fFilterPrivacy				= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 23 );
+                            fInFReplaceNoRM				= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 24 );
+                            fSeenRepairs				= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 25 );
+                            fHasXML						= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 26 );
+                            fSeeScriptAnchorsPag		= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 27 );
+                            fValidateXML				= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 28 );
+                            fSaveIfInvalidXML			= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 29 );
+                            fShowXMLErrors				= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 30 );
+                            fAlwaysMergeEmptyNamespace	= FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 31 );
+							
+							if ( size > 544/* && fib->m_FibNew.nFibNew > Fib2000*/)
+							{
+								cpMaxListCacheMainDoc		= FormatUtils::BytesToInt32( bytes, 544, size );	//unused
 
-                            cpMaxListCacheMainDoc = FormatUtils::BytesToInt32( bytes, 544, size );
+								//split bytes 548,549 into bits
+								fDoNotEmbedSystemFont = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 0 );
+								fWordCompact		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 1 );
+								fLiveRecover		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 2 );
+								fEmbedFactoids		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 3 );
+								fFactoidXML			= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 4 );
+								fFactoidAllDone		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 5 );
+								fFolioPrint			= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 6 );
+								fReverseFolio		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 7 );
+								iTextLineEnding		= (short)FormatUtils::GetUIntFromBytesBits( ( bytes + 548 ), 2, 8, 3 );
+								fHideFcc			= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 11 );
+								fAcetateShowMarkup	= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 12 );
+								fAcetateShowAtn		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 13 );
+								fAcetateShowInsDel	= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 14 );
+								fAcetateShowProps	= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 15 );
 
-                            //split bytes 548,549 into bits
-                            fDoNotEmbedSystemFont = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 0 );
-                            fWordCompact		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 1 );
-                            fLiveRecover		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 2 );
-                            fEmbedFactoids		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 3 );
-                            fFactoidXML			= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 4 );
-                            fFactoidAllDone		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 5 );
-                            fFolioPrint			= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 6 );
-                            fReverseFolio		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 7 );
-                            iTextLineEnding		= (short)FormatUtils::GetUIntFromBytesBits( ( bytes + 548 ), 2, 8, 3 );
-                            fHideFcc			= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 11 );
-                            fAcetateShowMarkup	= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 12 );
-                            fAcetateShowAtn		= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 13 );
-                            fAcetateShowInsDel	= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 14 );
-                            fAcetateShowProps	= FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 15 );
+								istdTableDflt		= FormatUtils::BytesToUInt16( bytes, 550, size );
+								verCompat			= FormatUtils::BytesToUInt16( bytes, 552, size );
+								grfFmtFilter		= FormatUtils::BytesToUInt16( bytes, 554, size );
+								iFolioPages			= FormatUtils::BytesToInt16	( bytes, 556, size );
+								cpgText				= FormatUtils::BytesToUInt16( bytes, 558, size );
+								cpMinRMText			= FormatUtils::BytesToInt32	( bytes, 560, size );
+								cpMinRMFtn			= FormatUtils::BytesToInt32	( bytes, 564, size );
+								cpMinRMHdd			= FormatUtils::BytesToInt32	( bytes, 568, size );
+								cpMinRMAtn			= FormatUtils::BytesToInt32	( bytes, 572, size );
+								cpMinRMEdn			= FormatUtils::BytesToInt32	( bytes, 576, size );
+								cpMinRMTxbx			= FormatUtils::BytesToInt32	( bytes, 580, size );
+								cpMinRMHdrTxbx		= FormatUtils::BytesToInt32	( bytes, 584, size );
+								rsidRoot			= FormatUtils::BytesToInt32	( bytes, 588, size );
+								//unused 2
 
-                            istdTableDflt		= FormatUtils::BytesToUInt16( bytes, 550, size );
-                            verCompat			= FormatUtils::BytesToUInt16( bytes, 552, size );
-                            grfFmtFilter		= FormatUtils::BytesToUInt16( bytes, 554, size );
-                            iFolioPages			= FormatUtils::BytesToInt16( bytes, 556, size );
-                            cpgText				= FormatUtils::BytesToUInt16( bytes, 558, size );
-                            cpMinRMText			= FormatUtils::BytesToInt32( bytes, 560, size );
-                            cpMinRMFtn			= FormatUtils::BytesToInt32( bytes, 564, size );
-                            cpMinRMHdd			= FormatUtils::BytesToInt32( bytes, 568, size );
-                            cpMinRMAtn			= FormatUtils::BytesToInt32( bytes, 572, size );
-                            cpMinRMEdn			= FormatUtils::BytesToInt32( bytes, 576, size );
-                            cpMinRMTxbx			= FormatUtils::BytesToInt32( bytes, 580, size );
-                            cpMinRMHdrTxbx		= FormatUtils::BytesToInt32( bytes, 584, size );
-                            rsidRoot			= FormatUtils::BytesToInt32( bytes, 588, size );
+								if ( size > 594/* && fib->m_FibNew.nFibNew > Fib2002*/)
+								{
+									//split bytes 592,593,594,595 into bits
+									fTreatLockAtnAsReadOnly = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 0 );
+									fStyleLock				= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 1 );
+									fAutoFmtOverride		= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 2 );
+									fRemoveWordML			= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 3 );
+									fApplyCustomXForm		= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 4 );
+									fStyeLockEnforced		= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 5 );
+									fFakeLockAtn			= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 6 );
+									fIgnoreMixedContent		= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 7 );
+									fShowPlaceholderText	= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 8 );
+									grf						= FormatUtils::GetUIntFromBytesBits( ( bytes + 592 ), 4, 9, 23 );
 
-                            if ( size == 610 )
-                            {
-                                //split bytes 592,593,594,595 into bits
-                                fTreatLockAtnAsReadOnly = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 0 );
-                                fStyleLock				= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 1 );
-                                fAutoFmtOverride		= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 2 );
-                                fRemoveWordML			= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 3 );
-                                fApplyCustomXForm		= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 4 );
-                                fStyeLockEnforced		= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 5 );
-                                fFakeLockAtn			= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 6 );
-                                fIgnoreMixedContent		= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 7 );
-                                fShowPlaceholderText	= FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 8 );
-                                grf						= FormatUtils::GetUIntFromBytesBits( ( bytes + 592 ), 4, 9, 23 );
+									//split bytes 596 and 597 into bits
+									fReadingModeInkLockDown = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 0 );
+									fAcetateShowInkAtn		= FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 1 );
+									fFilterDttm				= FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 2 );
+									fEnforceDocProt			= FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 3 );
+									iDocProtCur				= (unsigned short)FormatUtils::GetUIntFromBytesBits( ( bytes + 596 ), 2, 4, 3 );
+									fDispBkSpSaved			= FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 7 );
 
-                                //split bytes 596 and 597 into bits
-                                fReadingModeInkLockDown = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 0 );
-                                fAcetateShowInkAtn = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 1 );
-                                fFilterDttm = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 2 );
-                                fEnforceDocProt = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 3 );
-                                iDocProtCur = (unsigned short)FormatUtils::GetUIntFromBytesBits( ( bytes + 596 ), 2, 4, 3 );
-                                fDispBkSpSaved = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 7 );
-
-                                dxaPageLock = FormatUtils::BytesToInt16( bytes, 598, size );
-                                dyaPageLock = FormatUtils::BytesToInt16( bytes, 600, size );
-                                pctFontLock = FormatUtils::BytesToInt32( bytes, 602, size );
-                                grfitbid = bytes[606];
-                                //unsigned char 607 is unused
-                                ilfoMacAtCleanup = FormatUtils::BytesToUInt16( bytes, 608, size );
-                            }
+									dxaPageLock = FormatUtils::BytesToInt16( bytes, 598, size );
+									dyaPageLock = FormatUtils::BytesToInt16( bytes, 600, size );
+									pctFontLock = FormatUtils::BytesToInt32( bytes, 602, size );
+									grfitbid = bytes[606];
+									//unsigned char 607 is unused
+									ilfoMacAtCleanup = FormatUtils::BytesToUInt16( bytes, 608, size );
+		 
+									if ( size > 616/* && fib->m_FibNew.nFibNew > Fib2003*/)
+									{
+										//4 bytes reserved
+										bool fRMTrackFormatting = FormatUtils::GetBitFromBytes( ( bytes + 620 ), 2, 0 );
+										bool fRMTrackMoves		= FormatUtils::GetBitFromBytes( ( bytes + 620 ), 2, 1 );
+										//dopMth  = 34 bytes from 624 = 658
+										
+										if ( size > 674/* && fib->m_FibNew.nFibNew > Fib2007*/)
+										{
+											if ( size > 690/* && fib->m_FibNew.nFibNew > Fib2010*/)
+											{
+											}
+										}
+									}
+								}
+							}
                         }
                     }
                 }
@@ -524,6 +612,7 @@ namespace DocFileFormat
       fSwapBordersFacingPgs = false;
       dxaTab = 0;
       wSpare = 0;
+	  wSpare3 = 0;
       dxaHotZ = 0;
       cConsecHypLim = 0;
       wSpare2 = 0;

ASCOfficeDocFile/DocDocxConverter/DocumentProperties.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -54,6 +54,7 @@ namespace DocFileFormat
 
         friend class SettingsMapping;
 
+		bool bDisplayBackgroundShape;
 	private:    
         // True when facing pages should be printed
 		bool fFacingPages;
@@ -176,7 +177,8 @@ namespace DocFileFormat
 		unsigned short cConsecHypLim;
         // Reserved
 		unsigned short wSpare2;
-        // Date and time document was created
+ 		unsigned short wSpare3;
+       // Date and time document was created
 		DateAndTime dttmCreated;
         // Date and time document was last revised
 		DateAndTime dttmRevised;

ASCOfficeDocFile/DocDocxConverter/DocumentTypographyInfo.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/DrawingObjectGrid.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -33,7 +33,6 @@
 #include "DrawingPrimitives.h"
 #include "VirtualStreamReader.h"
 
-
 namespace DocFileFormat
 {
 	DrawingPrimitive * DrawingPrimitive::Create(VirtualStreamReader* reader, int length, short dpk)

ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/EmuValue.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -35,137 +35,148 @@
 
 namespace DocFileFormat
 {
-	EncryptionHeader::EncryptionHeader( FileInformationBlock* fib, POLE::Stream* tableStream )
+	EncryptionHeader::EncryptionHeader( FileInformationBlock* fib, POLE::Stream* tableStream ) : bStandard(false), bXOR(false), bAES(false)
 	{
-		VirtualStreamReader tStream( tableStream, 0, fib->m_bOlderVersion);
+		VirtualStreamReader tStream( tableStream, 0, fib->m_nWordVersion);
 
-		if (fib->m_FibBase.fObfuscation)
+		if (fib->m_FibBase.fObfuscation || fib->m_nWordVersion > 0)
 		{
-			//xor
-			return;
-		}
-		unsigned short vMajor = tStream.ReadUInt16();
-		unsigned short vMinor = tStream.ReadUInt16();
-
-		if(0x0001 == vMajor) // RC4 encryption header structure
-		{// fib->m_FibBase.lKey == 52 
-			bStandard = true;
-
-			crypt_data_rc4.Salt.b1  = tStream.ReadUInt32();
-			crypt_data_rc4.Salt.b2  = tStream.ReadUInt32();
-			crypt_data_rc4.Salt.b3  = tStream.ReadUInt32();
-			crypt_data_rc4.Salt.b4  = tStream.ReadUInt32();
+			bXOR = true;
 			
-			crypt_data_rc4.EncryptedVerifier.b1  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifier.b2  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifier.b3  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifier.b4  = tStream.ReadUInt32();
-			
-			crypt_data_rc4.EncryptedVerifierHash.b1  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifierHash.b2  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifierHash.b3  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifierHash.b4  = tStream.ReadUInt32();
+			crypt_data_xor.key  = fib->m_FibBase.lKey >> 16;
+			crypt_data_xor.hash  = fib->m_FibBase.lKey - (crypt_data_xor.key << 16);
 		}
 		else
 		{
-			bStandard				= false;
-			crypt_data_aes.bAgile	= false;
+			unsigned short vMajor = tStream.ReadUInt16();
+			unsigned short vMinor = tStream.ReadUInt16();
 
-			unsigned short flags = tStream.ReadUInt32();
-			unsigned char *pDataRead = NULL;
+			if(0x0001 == vMajor) // RC4 encryption header structure
+			{// fib->m_FibBase.lKey == 52 
+				bStandard = true;
 
-			bool fCryptoAPI	= GETBIT(flags, 1);
-			bool fDocProps	= GETBIT(flags, 2);
-			bool fExternal	= GETBIT(flags, 3);
-			bool fAES		= GETBIT(flags, 4);
-
-		//EncryptionHeader
-			int HeaderSize	= tStream.ReadUInt32();
-			int Flags		= tStream.ReadUInt32();
-			int SizeExtra	= tStream.ReadUInt32();
-			int AlgID		= tStream.ReadUInt32();
-			int AlgIDHash	= tStream.ReadUInt32();
-			int KeySize		= tStream.ReadUInt32();
-			int ProviderType= tStream.ReadUInt32();
-			int Reserved1	= tStream.ReadUInt32();
-			int Reserved2	= tStream.ReadUInt32();
-
-			int pos		= tStream.GetPosition();
-			int size	= tStream.GetSize();
-
-			std::vector<char> dataCSPName;
-			while(pos  < size - 1)
+				crypt_data_rc4.Salt.b1  = tStream.ReadUInt32();
+				crypt_data_rc4.Salt.b2  = tStream.ReadUInt32();
+				crypt_data_rc4.Salt.b3  = tStream.ReadUInt32();
+				crypt_data_rc4.Salt.b4  = tStream.ReadUInt32();
+				
+				crypt_data_rc4.EncryptedVerifier.b1  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifier.b2  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifier.b3  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifier.b4  = tStream.ReadUInt32();
+				
+				crypt_data_rc4.EncryptedVerifierHash.b1  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifierHash.b2  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifierHash.b3  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifierHash.b4  = tStream.ReadUInt32();
+			}
+			else
 			{
-				dataCSPName.push_back(tStream.ReadByte());
-				dataCSPName.push_back(tStream.ReadByte());
-				if (dataCSPName[dataCSPName.size() - 1] == 0 && dataCSPName[dataCSPName.size() - 2] == 0)
+				bAES					= true;
+				crypt_data_aes.bAgile	= false;
+
+				unsigned short flags = tStream.ReadUInt32();
+				unsigned char *pDataRead = NULL;
+
+				bool fCryptoAPI				= GETBIT(flags, 1);
+				crypt_data_aes.fDocProps	= GETBIT(flags, 2);
+				bool fExternal				= GETBIT(flags, 3);
+				bool fAES					= GETBIT(flags, 4);
+
+			//EncryptionHeader
+				int HeaderSize	= tStream.ReadUInt32();
+				int Flags		= tStream.ReadUInt32();
+				int SizeExtra	= tStream.ReadUInt32();
+				int AlgID		= tStream.ReadUInt32();
+				int AlgIDHash	= tStream.ReadUInt32();
+				int KeySize		= tStream.ReadUInt32();
+				int ProviderType= tStream.ReadUInt32();
+				int Reserved1	= tStream.ReadUInt32();
+				int Reserved2	= tStream.ReadUInt32();
+
+				int pos		= tStream.GetPosition();
+				int size	= tStream.GetSize();
+
+				std::vector<char> dataCSPName;
+				while(pos  < size - 1)
 				{
+					dataCSPName.push_back(tStream.ReadByte());
+					dataCSPName.push_back(tStream.ReadByte());
+					if (dataCSPName[dataCSPName.size() - 1] == 0 && dataCSPName[dataCSPName.size() - 2] == 0)
+					{
+						break;
+					}
+					pos+=2;//unicode null-terminate string
+				}
+			//EncryptionVerifier
+				crypt_data_aes.saltSize = tStream.ReadUInt32();
+				pDataRead = tStream.ReadBytes(crypt_data_aes.saltSize, true);
+				if (pDataRead)
+				{
+					crypt_data_aes.saltValue = std::string((char*)pDataRead, crypt_data_aes.saltSize);	
+					delete pDataRead;
+				}
+				
+				pDataRead = tStream.ReadBytes(0x10, true);
+				if (pDataRead)
+				{
+					crypt_data_aes.encryptedVerifierInput = std::string((char*)pDataRead, 0x10);
+					delete pDataRead;
+				}
+
+				crypt_data_aes.hashSize = tStream.ReadUInt32();
+						
+				int szEncryptedVerifierHash = (ProviderType == 0x0001) ? 0x14 : 0x20;
+				pDataRead = tStream.ReadBytes(szEncryptedVerifierHash, true);
+				if (pDataRead)
+				{
+					crypt_data_aes.encryptedVerifierValue = std::string((char*)pDataRead, szEncryptedVerifierHash);
+					delete pDataRead;
+				}
+
+				pos = tStream.GetPosition();
+				
+			//------------------------------------------------------------------------------------------
+				switch(AlgIDHash)
+				{
+					case 0x8003: crypt_data_aes.hashAlgorithm = CRYPT_METHOD::MD5;	break;
+					case 0x0000: 
+					case 0x8004: crypt_data_aes.hashAlgorithm = CRYPT_METHOD::SHA1;	break;
+				}
+				crypt_data_aes.spinCount = 0;
+
+				switch(AlgID)
+				{
+				case 0x0000:
+					if (fAES)		crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
+					if (fCryptoAPI)	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;	
+					crypt_data_aes.keySize = KeySize / 8;
+				case 0x6801:	
+					crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		
+					crypt_data_aes.keySize = KeySize / 8;
+					
+					if (crypt_data_aes.keySize == 0)	crypt_data_aes.keySize = 5; // 40 bit
+					break;
+				case 0x660E:	
+					crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
+					crypt_data_aes.keySize	= 128 /8;	
+					break;
+				case 0x660F:	
+					crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
+					crypt_data_aes.keySize	= 192 /8;	
+					break;
+				case 0x6610:	
+					crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
+					crypt_data_aes.keySize	= 256 /8;	
 					break;
 				}
-				pos+=2;//unicode null-terminate string
-			}
-		//EncryptionVerifier
-			crypt_data_aes.saltSize = tStream.ReadUInt32();
-			pDataRead = tStream.ReadBytes(crypt_data_aes.saltSize, true);
-			if (pDataRead)
-			{
-				crypt_data_aes.saltValue = std::string((char*)pDataRead, crypt_data_aes.saltSize);	
-				delete pDataRead;
-			}
-			
-			pDataRead = tStream.ReadBytes(0x10, true);
-			if (pDataRead)
-			{
-				crypt_data_aes.encryptedVerifierInput = std::string((char*)pDataRead, 0x10);
-				delete pDataRead;
-			}
 
-			crypt_data_aes.hashSize = tStream.ReadUInt32();
-					
-			int szEncryptedVerifierHash = (ProviderType == 0x0001) ? 0x14 : 0x20;
-			pDataRead = tStream.ReadBytes(szEncryptedVerifierHash, true);
-			if (pDataRead)
-			{
-				crypt_data_aes.encryptedVerifierValue = std::string((char*)pDataRead, szEncryptedVerifierHash);
-				delete pDataRead;
+				//switch(ProviderType)
+				//{
+				//	case 0x0001:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		break;
+				//	case 0x0018:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB; break;
+				//}
 			}
-
-			pos = tStream.GetPosition();
-			
-		//------------------------------------------------------------------------------------------
-			crypt_data_aes.hashAlgorithm = CRYPT_METHOD::SHA1; //by AlgIDHash -> 0x0000 || 0x8004
-			crypt_data_aes.spinCount		= 50000;
-
-			switch(AlgID)
-			{
-			case 0x6801:	
-				crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		
-				crypt_data_aes.keySize = KeySize / 8;
-				break;
-			case 0x660E:	
-				crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
-				crypt_data_aes.keySize	= 128 /8;	
-				break;
-			case 0x660F:	
-				crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
-				crypt_data_aes.keySize	= 192 /8;	
-				break;
-			case 0x6610:	
-				crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
-				crypt_data_aes.keySize	= 256 /8;	
-				break;
-			}
-
-			switch(ProviderType)
-			{
-			case 0x0001:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		break;
-			case 0x0018:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB; break;
-			}
-
-
 		}
-
-		//RELEASEARRAYOBJECTS( bytes );
 	}
-
 }

ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -50,8 +50,12 @@ namespace DocFileFormat
         
 		EncryptionHeader( FileInformationBlock* fib, POLE::Stream* tableStream );
 	private:    
-		CRYPT::CryptRC4Data					crypt_data_rc4;
-		CRYPT::ECMADecryptor::_cryptData	crypt_data_aes;
-		bool								bStandard;
+		CRYPT::_rc4CryptData	crypt_data_rc4;
+		CRYPT::_ecmaCryptData	crypt_data_aes;
+		CRYPT::_xorCryptData	crypt_data_xor;
+		
+		bool					bStandard;
+		bool					bXOR;
+		bool					bAES;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/EndnoteDescriptor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -54,24 +54,24 @@ namespace DocFileFormat
 
 				int id = 0;
 
-				m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) );
-				m_pXmlWriter->WriteNodeBegin( _T( "w:endnotes" ), TRUE );
+                m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
+                m_pXmlWriter->WriteNodeBegin( L"w:endnotes", TRUE );
 
 				//write namespaces
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships );
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                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->WriteNodeEnd( L"", TRUE, FALSE );
 
 				int cp = ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn );
 
 				while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn + m_document->FIB->m_RgLw97.ccpEdn - 2 ) )
 				{
-					m_pXmlWriter->WriteNodeBegin( _T( "w:endnote" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id ).c_str() );
-					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                    m_pXmlWriter->WriteNodeBegin( L"w:endnote", TRUE );
+                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( id ));
+                    m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpAtn ) < (*m_document->IndividualEndnotesPlex)[id + 1] )
 					{
@@ -79,7 +79,7 @@ namespace DocFileFormat
 						if (fc < 0) break;
 
 						ParagraphPropertyExceptions* papx = findValidPapx( fc );
-						TableInfo tai( papx );
+						TableInfo tai( papx, m_document->nWordVersion );
 
 						if ( tai.fInTable )
 						{
@@ -91,18 +91,18 @@ namespace DocFileFormat
 						else
 						{
 							//this PAPX is for a normal paragraph
-							cp = writeParagraph( cp );
+							cp = writeParagraph( cp, 0x7fffffff );
 						}
 					}
 
-					m_pXmlWriter->WriteNodeEnd( _T( "w:endnote" ) );
+                    m_pXmlWriter->WriteNodeEnd( L"w:endnote");
 					id++;
 				}
 
-				m_pXmlWriter->WriteNodeEnd( _T( "w:endnotes" ) );
+                m_pXmlWriter->WriteNodeEnd( L"w:endnotes");
 
 				m_context->_docx->EndnotesXML = std::wstring( m_pXmlWriter->GetXmlString() );
 			}
 		}
 	};
-}
+}

ASCOfficeDocFile/DocDocxConverter/FieldCharacter.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -49,39 +49,46 @@ namespace DocFileFormat
 			unsigned char fNested:1;
 			unsigned char fHasSep:1;
 		};
-
-	public:
 		static const int STRUCTURE_SIZE = 2;
 
-		FieldCharacter():
-		fldch(0), grffld(0)
-		{
-		}
-
-		virtual ~FieldCharacter()
-		{
-		}
+		FieldCharacter() : fldch(0), grffld(0)	{}
+		virtual ~FieldCharacter()	{}
 
 		virtual ByteStructure* ConstructObject (VirtualStreamReader* pReader, int length)
 		{
-			FieldCharacter* pFldChar	=	new FieldCharacter();
+			FieldCharacter* pFldChar = new FieldCharacter();
 			if (pFldChar)
 			{
-				pFldChar->fldch				=	pReader->ReadByte();
-				pFldChar->grffld			=	pReader->ReadByte();
-
-#ifdef _DEBUG
-				grffldEnd*	__grffldEnd	=	(grffldEnd*)(&pFldChar->grffld);
-				int dbg						=	0;
-#endif
+				pFldChar->fldch		= pReader->ReadByte();
+				pFldChar->grffld	= pReader->ReadByte();
 			}
 
 			return static_cast<ByteStructure*>(pFldChar);
 		}
 
-	private:
-
 		unsigned char fldch;
 		unsigned char grffld;
 	};
+
+	class ListNumCache: public ByteStructure
+	{
+	public:
+		static const int STRUCTURE_SIZE = 4;
+
+		ListNumCache() : value(-1)		{}
+		virtual			~ListNumCache()	{}
+		
+		virtual ByteStructure* ConstructObject (VirtualStreamReader* pReader, int length)
+		{
+			ListNumCache* pList	= new ListNumCache();
+			if (pList)
+			{
+				pList->value = pReader->ReadInt32();
+			}
+
+			return static_cast<ByteStructure*>(pList);
+		}
+
+		int value;
+	};
 }

ASCOfficeDocFile/DocDocxConverter/FixedPointNumber.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/FontFamilyName.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -69,14 +69,22 @@ namespace DocFileFormat
 		newObject->prq			= (unsigned char)	FormatUtils::BitmaskToInt	( ffid, 0x03 );
 		newObject->fTrueType	=					FormatUtils::BitmaskToBool	( ffid, 0x04 );
 		newObject->ff			= (unsigned char)	FormatUtils::BitmaskToInt	( ffid, 0x70 );
-		newObject->wWeight		= reader->ReadInt16();
-		newObject->chs			= reader->ReadByte();
 
 		//int sz_fonts = 150; //..  нужно генерить уникальное todooo
+		int szAlt = 0;
+		if (reader->nWordVersion == 2)
+		{
+			newObject->wWeight = reader->ReadByte();
+		}
+		else
+		{
+			newObject->wWeight		= reader->ReadInt16();
+			newObject->chs			= reader->ReadByte();
 		
-		int szAlt = reader->ReadByte();
+			szAlt = reader->ReadByte();
+		}
 
-		if (!reader->olderVersion)
+		if (reader->nWordVersion == 0)
 		{
 			//read the 10 bytes panose
 			newObject->panoseSize = 10;
@@ -97,7 +105,7 @@ namespace DocFileFormat
 
 		unsigned char *bytes = reader->ReadBytes( (int)( strEnd - strStart ), true );
 
-		if (reader->olderVersion)
+		if (reader->nWordVersion > 0)
 		{
 			FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &(newObject->xszFtn), bytes, (int)( strEnd - strStart ), ENCODING_WINDOWS_1250 );
 		}
@@ -131,7 +139,7 @@ namespace DocFileFormat
 
 			bytes = reader->ReadBytes( (int)( strEnd - strStart ), true );
 
-			if (reader->olderVersion)
+			if (reader->nWordVersion > 0)
 			{
 				FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &(newObject->xszAlt), bytes, (int)( strEnd - strStart ), ENCODING_WINDOWS_1250);
 			}
@@ -151,7 +159,7 @@ namespace DocFileFormat
     {
 	  long strStart = reader->GetPosition();
       
-	  if (reader->olderVersion)
+	  if (reader->nWordVersion > 0)
 	  {//ansi string only
 		  while ( reader->ReadByte() != 0 )
 		  {

ASCOfficeDocFile/DocDocxConverter/FontFamilyName.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -48,7 +48,8 @@ namespace DocFileFormat
 
   class FontFamilyName: public ByteStructure
   {
-    friend class CharacterPropertiesMapping;
+	friend class WordDocument;
+	friend class CharacterPropertiesMapping;
 	friend class DocumentMapping;
 	friend class FontTableMapping;
 	friend class StyleSheetMapping;

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,107 +34,110 @@
 
 namespace DocFileFormat
 {
-	FontTableMapping::FontTableMapping( ConversionContext* ctx ): AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() )
+	FontTableMapping::FontTableMapping( ConversionContext* ctx ) : AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() )
 	{
 		_ctx = ctx;
 	}
 
-	/*========================================================================================================*/
 
 	FontTableMapping::~FontTableMapping()
 	{
 		RELEASEOBJECT (m_pXmlWriter);
 	}
 
-	/*========================================================================================================*/
 
 	void FontTableMapping::Apply( IVisitable* visited )
 	{
 		StringTable<FontFamilyName>* table = static_cast<StringTable<FontFamilyName>*>( visited );
 
-		this->_ctx->_docx->RegisterFontTable();
+		_ctx->_docx->RegisterFontTable();
 
-		m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) );
-		m_pXmlWriter->WriteNodeBegin( _T( "w:fonts" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+        m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
+        m_pXmlWriter->WriteNodeBegin( L"w:fonts", TRUE );
+        m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 		int sz_fonts = table->Data.size();
+		int users_fonts = 0;
 
 		for ( std::vector<ByteStructure*>::iterator iter = table->Data.begin(); iter != table->Data.end(); iter++ )
 		{
 			FontFamilyName* font = dynamic_cast<FontFamilyName*>( *iter );
 
-			m_pXmlWriter->WriteNodeBegin( _T( "w:font" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:name" ), FormatUtils::XmlEncode(font->xszFtn, true).c_str());
-			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+            m_pXmlWriter->WriteNodeBegin( L"w:font", TRUE );
+
+			std::wstring name_ = FormatUtils::XmlEncode(font->xszFtn, true);
+			if (name_.empty()) 
+				name_ = L"UserFont_" + std::to_wstring(++users_fonts);
+            m_pXmlWriter->WriteAttribute( L"w:name", name_);
+            m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 			//alternative name
-			if ( ( font->xszAlt != std::wstring( _T( "" ) ) ) && ( font->xszAlt.length() > 0 ) )
+            if ( ( font->xszAlt != std::wstring( L"" ) ) && ( font->xszAlt.length() > 0 ) )
 			{
-				m_pXmlWriter->WriteNodeBegin( _T( "w:altName" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(font->xszAlt, true).c_str() );
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
-				m_pXmlWriter->WriteNodeEnd( _T( "w:altName" ) );
+                m_pXmlWriter->WriteNodeBegin( L"w:altName", TRUE );
+                m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(font->xszAlt, true));
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+                m_pXmlWriter->WriteNodeEnd( L"w:altName" );
 			}
 
 			//charset
-			m_pXmlWriter->WriteNodeBegin( _T("w:charset" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( font->chs, _T( "%02x" ) ).c_str() );
-			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
-			m_pXmlWriter->WriteNodeEnd( _T( "w:charset" ) );
+            m_pXmlWriter->WriteNodeBegin( L"w:charset", TRUE );
+            m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( font->chs, L"%02x" ));
+            m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+            m_pXmlWriter->WriteNodeEnd( L"w:charset" );
 
 			//font family
-			m_pXmlWriter->WriteNodeBegin( _T("w:family"), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( font->ff, &FontFamily[0][0], 6, 11 ).c_str() );
-			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
-			m_pXmlWriter->WriteNodeEnd( _T( "w:family" ) );
+            m_pXmlWriter->WriteNodeBegin( L"w:family", TRUE );
+            m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString( font->ff, &FontFamily[0][0], 6, 11 ));
+            m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+            m_pXmlWriter->WriteNodeEnd( L"w:family" );
 
 			//panose
-			m_pXmlWriter->WriteNodeBegin( _T("w:panose1"), TRUE );
+            m_pXmlWriter->WriteNodeBegin( L"w:panose1", TRUE );
 
-			std::wstring wstr( _T( "" ) );
+            std::wstring wstr( L"" );
 
 			for ( unsigned int i = 0; i < font->panoseSize; i++ )
 			{
-				wstr += FormatUtils::IntToFormattedWideString( font->panose[i], _T( "%02x" ) );
+                wstr += FormatUtils::IntToFormattedWideString( font->panose[i], L"%02x" );
 			}
 
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), wstr.c_str() );
-			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
-			m_pXmlWriter->WriteNodeEnd( _T( "w:panose1" ) );
+            m_pXmlWriter->WriteAttribute( L"w:val", wstr);
+            m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+            m_pXmlWriter->WriteNodeEnd( L"w:panose1" );
 
 			//pitch
-			m_pXmlWriter->WriteNodeBegin( _T("w:pitch"), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( font->prq, &FontPitch[0][0], 3, 9 ).c_str() );
-			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
-			m_pXmlWriter->WriteNodeEnd( _T( "w:pitch" ) );
+            m_pXmlWriter->WriteNodeBegin( L"w:pitch", TRUE );
+            m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString( font->prq, &FontPitch[0][0], 3, 9 ));
+            m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+            m_pXmlWriter->WriteNodeEnd( L"w:pitch" );
 
 			//truetype
 			if ( !font->fTrueType )
 			{
-				m_pXmlWriter->WriteNodeBegin( _T("w:notTrueType"), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "true" ) );
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
-				m_pXmlWriter->WriteNodeEnd( _T( "w:notTrueType" ) );
+                m_pXmlWriter->WriteNodeBegin( L"w:notTrueType", TRUE );
+                m_pXmlWriter->WriteAttribute( L"w:val", L"true" );
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+                m_pXmlWriter->WriteNodeEnd( L"w:notTrueType" );
 			}
 
 			//font signature
-			m_pXmlWriter->WriteNodeBegin( _T("w:sig"), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:usb0" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield0, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteAttribute( _T( "w:usb1" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield1, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteAttribute( _T( "w:usb2" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield2, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteAttribute( _T( "w:usb3" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield3, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteAttribute( _T( "w:csb0" ), FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield0, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteAttribute( _T( "w:csb1" ), FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield1, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
-			m_pXmlWriter->WriteNodeEnd( _T( "w:sig" ) );
+            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->WriteNodeEnd( L"", TRUE, FALSE );
+            m_pXmlWriter->WriteNodeEnd( L"w:sig" );
 
-			m_pXmlWriter->WriteNodeEnd( _T( "w:font" ) );
+            m_pXmlWriter->WriteNodeEnd( L"w:font" );
 		}
 
-		m_pXmlWriter->WriteNodeEnd( _T("w:fonts") );
+        m_pXmlWriter->WriteNodeEnd( L"w:fonts");
 
-		this->_ctx->_docx->FontTableXML = std::wstring( m_pXmlWriter->GetXmlString() );
+		_ctx->_docx->FontTableXML = m_pXmlWriter->GetXmlString() ;
 	}
-}
+}

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -42,19 +42,19 @@ namespace DocFileFormat
 {
   static const wchar_t FontFamily[6][11] =
   {
-    _T( "auto" ),
-    _T( "roman" ),
-    _T( "swiss" ),
-    _T( "modern" ),
-    _T( "script" ),
-    _T( "decorative" )
+    L"auto",
+    L"roman",
+    L"swiss",
+    L"modern",
+    L"script",
+    L"decorative"
   };
 
   static const wchar_t FontPitch[3][9] =
   {
-    _T( "default" ),
-    _T( "fixed" ),
-    _T( "variable" )
+    L"default",
+    L"fixed",
+    L"variable"
   };
 
   class FontTableMapping: public AbstractOpenXmlMapping, public IMapping

ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -45,16 +45,16 @@ namespace DocFileFormat
 		m_document = static_cast<WordDocument*>( visited );
 
 		//start the document
-		m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) );
-		m_pXmlWriter->WriteNodeBegin( _T( "w:ftr" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
+        m_pXmlWriter->WriteNodeBegin( L"w:ftr", TRUE );
 
 		//write namespaces
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships );
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+        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->WriteNodeEnd( L"", TRUE, FALSE );
 
 		//convert the footer text
 		_lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0];
@@ -71,25 +71,30 @@ namespace DocFileFormat
 			if (fc < 0) break;
 
 			ParagraphPropertyExceptions* papx = findValidPapx( fc );
-			TableInfo tai( papx );
+			TableInfo tai( papx, m_document->nWordVersion );
 
 			if ( tai.fInTable )
 			{
 				//this PAPX is for a table
 				//cp = writeTable( cp, tai.iTap );
+				int start_table_cp = cp;
+				
 				Table table( this, cp, ( ( tai.iTap > 0 ) ? ( 1 ) : ( 0 ) ) );
 				table.Convert( this );
 				cp = table.GetCPEnd();
+
+				if (cp == start_table_cp)
+					cp++;
 			}
 			else
 			{
 				//this PAPX is for a normal paragraph
-				cp = writeParagraph( cp );
+				cp = writeParagraph( cp, 0x7fffffff );
 			}
 		}
 
-		m_pXmlWriter->WriteNodeEnd( _T( "w:ftr" ) );
+        m_pXmlWriter->WriteNodeEnd( L"w:ftr" );
 
 		m_context->_docx->FooterXMLList.push_back( std::wstring( m_pXmlWriter->GetXmlString() ) );
 	}
-}
+}

ASCOfficeDocFile/DocDocxConverter/FooterMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/FootnoteDescriptor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -54,32 +54,34 @@ namespace DocFileFormat
 
 				int id = 0;
 
-				m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) );
-				m_pXmlWriter->WriteNodeBegin( _T( "w:footnotes" ), TRUE );
+                m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
+                m_pXmlWriter->WriteNodeBegin( L"w:footnotes", TRUE );
 
 				//write namespaces
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships );
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                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->WriteNodeEnd( L"", TRUE, FALSE );
 
 				int cp = m_document->FIB->m_RgLw97.ccpText;
 
 				while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn - 2 ) )
 				{
-					m_pXmlWriter->WriteNodeBegin( _T( "w:footnote" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id ).c_str() );
-					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                    m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE );
+                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( id ));
+                    m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText ) < (*m_document->IndividualFootnotesPlex)[id + 1] )
 					{
+						int cpStart = cp;
+						
 						int fc =  m_document->FindFileCharPos(cp);
 						if (fc < 0) break;
 
 						ParagraphPropertyExceptions* papx = findValidPapx( fc );
-						TableInfo tai( papx );
+						TableInfo tai( papx, m_document->nWordVersion );
 
 						if ( tai.fInTable )
 						{
@@ -91,18 +93,20 @@ namespace DocFileFormat
 						else
 						{
 							//this PAPX is for a normal paragraph
-							cp = writeParagraph( cp );
+							cp = writeParagraph( cp, 0x7fffffff );
 						}
+						while (cp <= cpStart)	//conv_fQioC665ib4ngHkDGY4__docx.doc
+							cp++;
 					}
 
-					m_pXmlWriter->WriteNodeEnd( _T( "w:footnote" ) );
+                    m_pXmlWriter->WriteNodeEnd( L"w:footnote");
 					id++;
 				}
 
-				m_pXmlWriter->WriteNodeEnd( _T( "w:footnotes" ) );
+                m_pXmlWriter->WriteNodeEnd( L"w:footnotes");
 
 				m_context->_docx->FootnotesXML = std::wstring(m_pXmlWriter->GetXmlString());
 			}
 		}
 	};
-}
+}

ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp

@@ -0,0 +1,170 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2018
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include "FormFieldData.h"
+#include "../../Common/DocxFormat/Source/Base/unicode_util.h"
+
+namespace DocFileFormat
+{
+std::wstring readXstz(VirtualStreamReader *reader)
+{
+	if (!reader) return L"";
+
+	unsigned short flags, cch, chTerm;
+
+	cch = reader->ReadUInt16();
+
+	std::wstring ret;
+
+	if (cch > 0)
+	{
+		std::shared_ptr<unsigned char>data = std::shared_ptr<unsigned char>(reader->ReadBytes(cch * 2, true));	
+#if defined(_WIN32) || defined(_WIN64)
+        ret = std::wstring((wchar_t*)data.get(), cch );
+#else
+        ret = convertUtf16ToWString((UTF16*)data.get(), cch );
+#endif
+	}
+	chTerm  = reader->ReadUInt16();
+
+	return ret;
+};
+void FormFieldData::_HFD::read(VirtualStreamReader *reader)
+{
+	if (!reader) return;
+}
+void FormFieldData::_FFData::read(VirtualStreamReader *reader)
+{
+	if (!reader) return;
+
+	bExist = true;
+	
+	unsigned short flags;
+
+	version		= reader->ReadUInt32();
+	flags		= reader->ReadUInt16();
+
+	iType		= GETBITS(flags, 0, 1);
+	iRes		= GETBITS(flags, 2, 6);
+	fOwnHelp	= GETBIT(flags, 7);
+	fOwnStat	= GETBIT(flags, 8);
+	fProt		= GETBIT(flags, 9);
+	iSize		= GETBIT(flags, 10);
+	iTypeTxt	= GETBITS(flags, 11, 13);
+	fRecalc		= GETBIT(flags, 14);
+	fHasListBox = GETBIT(flags, 15);
+
+	cch_field	= reader->ReadUInt16();
+	hps			= reader->ReadUInt16();
+
+	xstzName	= readXstz(reader);
+	xstzTextDef	= readXstz(reader);
+	
+	wDef = reader->ReadUInt16();
+	
+	xstzTextFormat	= readXstz(reader);
+	xstzHelpText	= readXstz(reader);
+	xstzStatText	= readXstz(reader);
+	xstzEntryMcr	= readXstz(reader);
+	xstzExitMcr		= readXstz(reader);
+}
+FormFieldData::FormFieldData( int type, const CharacterPropertyExceptions* chpx, POLE::Stream* stream, int nWordVersion )
+{
+	binary_data_size = 0;
+
+	if (!chpx) return;
+
+	int fc = -1;
+	bool bNilPICFAndBinData = false;
+
+	for ( std::list<SinglePropertyModifier>::iterator iter = chpx->grpprl->begin(); iter != chpx->grpprl->end(); iter++ )
+	{
+		switch ( iter->OpCode)
+		{
+			case sprmCFSpec:
+			{
+			}
+			break;
+			case sprmCFFldVanish:
+			{
+			}
+			break;
+			case sprmCPicLocation:
+			{
+				fc = FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize );
+			}
+			break;
+			case sprmCRsidText:
+			{
+				rsid = FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt32(iter->Arguments, 0, iter->argumentsSize), L"%08x");
+			}
+			break;
+			case sprmCFData:
+			{
+				bNilPICFAndBinData = true; // or bPICFAndOfficeArtData - shape, pic, ole
+			}
+			break;
+		}
+	}
+
+	if (fc >= 0 && bNilPICFAndBinData)
+	{
+		VirtualStreamReader reader(stream, fc, nWordVersion);
+
+		int sz_stream = reader.GetSize();
+
+		int lcb = reader.ReadUInt32();
+		int cbHeader = reader.ReadUInt16();
+
+		if (cbHeader != 0x44) return;
+
+		//ignored
+		reader.ReadBytes(62, false);
+
+		switch(type)
+		{
+		case 1:
+			HFD.read(&reader);
+		case 2:
+			FFData.read(&reader);
+			break;
+		default:
+			binary_data_size = lcb - cbHeader;
+			binary_data = std::shared_ptr<unsigned char>(reader.ReadBytes(binary_data_size, true));
+			break;
+		}
+	}
+}
+
+
+}

ASCOfficeDocFile/DocDocxConverter/FormFieldData.h

@@ -0,0 +1,126 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2018
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include "IVisitable.h"
+#include "CharacterPropertyExceptions.h"
+#include "StructuredStorageReader.h"
+#include "VirtualStreamReader.h"
+
+namespace DocFileFormat
+{
+	class FormFieldData : public IVisitable
+	{
+ 	public:
+
+		struct _HFD
+		{
+			bool bExist = false;
+
+			bool fNew = false;
+			bool fNoHist = false;
+			bool fImageMap = false;
+			bool fLocation = false;
+			bool fTooltip = false;
+
+			std::wstring clsid;
+			
+			_UINT32	streamVersion = 0;
+			bool	hlstmfHasMoniker = false;
+			bool	hlstmfIsAbsolute = false;
+			bool	hlstmfSiteGaveDisplayName = false;
+			bool	hlstmfHasLocationStr = false;
+			bool	hlstmfHasDisplayName = false;
+			bool	hlstmfHasGUID = false;
+			bool	hlstmfHasCreationTime = false;
+			bool	hlstmfHasFrameName = false;
+			bool	hlstmfMonikerSavedAsStr = false;
+			bool	hlstmfAbsFromGetdataRel = false;
+
+			std::wstring displayName;
+			std::wstring targetFrameName;
+			std::wstring moniker;
+
+			std::wstring	oleMoniker_clsid;
+			std::wstring	oleMoniker_data;
+			std::wstring	location;
+
+			std::wstring	guid;
+			_UINT64			fileTime = 0;
+
+			void read(VirtualStreamReader* reader);
+		};
+		struct _FFData
+		{
+			bool		bExist = false;
+			_UINT32		version = 0;
+			
+			unsigned char	iType = 0;
+			unsigned char	iRes = 0;
+			bool			fOwnHelp = false;
+			bool			fOwnStat = false;
+			bool			fProt = false;
+			bool			iSize = false;
+			unsigned char	iTypeTxt = 0;
+			bool			fRecalc = false;
+			bool			fHasListBox = false;
+			
+			unsigned short	cch_field = 0;
+			unsigned short	hps = 0;
+			std::wstring	xstzName;
+			std::wstring	xstzTextDef;
+			unsigned short	wDef = 0;
+			std::wstring	xstzTextFormat;
+			std::wstring	xstzHelpText;
+			std::wstring	xstzStatText;
+			std::wstring	xstzEntryMcr;
+			std::wstring	xstzExitMcr;
+
+			//STTB			hsttbDropList;
+			void read(VirtualStreamReader* reader);
+		};
+		FormFieldData( int type, const CharacterPropertyExceptions* chpx, POLE::Stream* stream, int nWordVersion );
+		virtual ~FormFieldData() {}
+	private:
+		friend class FormFieldDataMapping;  
+
+		std::wstring name;
+		std::wstring rsid;
+
+		_FFData FFData;
+		_HFD	HFD;
+
+		std::shared_ptr<unsigned char> binary_data;
+		int binary_data_size;
+
+};
+}

ASCOfficeDocFile/DocDocxConverter/FormFieldDataMapping.h

@@ -0,0 +1,87 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2018
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include "ConversionContext.h"
+#include "FormFieldData.h"
+
+#include "AbstractOpenXmlMapping.h"
+#include "IMapping.h"
+
+namespace DocFileFormat
+{
+	class FormFieldDataMapping: public AbstractOpenXmlMapping, public IMapping
+	{
+	public:
+		FormFieldDataMapping(XMLTools::CStringXmlWriter* writer, ConversionContext* context, IMapping* caller) 
+																		: AbstractOpenXmlMapping(writer), m_context(NULL),_caller(NULL)
+		{
+			m_context	=	context;
+			_caller		=	caller;
+		}
+
+		virtual void Apply(IVisitable* visited)
+		{
+			FormFieldData* ffData = static_cast<FormFieldData*>(visited);
+
+			if ( ffData == NULL ) return;
+
+			if (ffData->FFData.bExist)
+			{
+                m_pXmlWriter->WriteNodeBegin( L"w:ffData");
+
+					m_pXmlWriter->WriteNodeBegin( L"w:name", true);
+						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.xstzName);
+					m_pXmlWriter->WriteNodeEnd(L"w:name", true, true );
+					
+					m_pXmlWriter->WriteNodeBegin( L"w:calcOnExit", true);
+						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.fRecalc);
+					m_pXmlWriter->WriteNodeEnd(L"w:calcOnExit", true, true );
+					
+					m_pXmlWriter->WriteNodeBegin( L"w:textInput");
+						
+						m_pXmlWriter->WriteNodeBegin( L"w:maxLength", true);
+							m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.cch_field);
+						m_pXmlWriter->WriteNodeEnd(L"w:maxLength", true, true );
+
+					m_pXmlWriter->WriteNodeEnd( L"w:textInput" );
+
+                m_pXmlWriter->WriteNodeEnd( L"w:ffData" );
+			}
+		}
+
+
+	private:  
+		ConversionContext*	m_context;
+		IMapping*			_caller;
+	};
+}

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPage.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPageCHPX.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -52,8 +52,8 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 
-	FormattedDiskPageCHPX::FormattedDiskPageCHPX( POLE::Stream* wordStream, int offset, bool oldVersion  ):
-																FormattedDiskPage(), rgb(NULL), grpchpxSize(NULL), grpchpx(NULL) 
+	FormattedDiskPageCHPX::FormattedDiskPageCHPX( POLE::Stream* wordStream, int offset, int nWordVersion ):
+																FormattedDiskPage(), rgb(NULL), grpchpxSize(0), grpchpx(NULL) 
 	{
 		Type = Character;
 		WordStream = wordStream;
@@ -80,7 +80,6 @@ namespace DocFileFormat
 			j += 4;
 		}
 
-		//create arrays
 		grpchpxSize		= crun;
 		rgb				= new unsigned char[crun];
 		grpchpx			= new CharacterPropertyExceptions*[grpchpxSize];
@@ -104,11 +103,10 @@ namespace DocFileFormat
 
 				//read the bytes of chpx
 				chpx = new unsigned char[cb];
-				//Array.Copy(bytes, (wordOffset * 2) + 1, chpx, 0, chpx.Length);
 				memcpy( chpx, ( bytes + (wordOffset * 2) + 1 ), cb );
 
 				//parse CHPX and fill grpchpx
-				grpchpx[i] = new CharacterPropertyExceptions( chpx, cb, oldVersion);
+				grpchpx[i] = new CharacterPropertyExceptions( chpx, cb, nWordVersion);
 
 				RELEASEARRAYOBJECTS( chpx );
 			}
@@ -139,7 +137,7 @@ namespace DocFileFormat
 		}
 		//there are n offsets and n-1 fkp's in the bin table
 
-		if (fib->m_bOlderVersion)
+		if (fib->m_nWordVersion > 0)
 		{
 			int				n		= ( ( (int)fib->m_FibWord97.lcbPlcfBteChpx - 8 ) / 6 ) + 1;
 	
@@ -162,7 +160,7 @@ namespace DocFileFormat
 				int offset = fkpnr * 512;
 
 				//parse the FKP and add it to the list
-				CHPXlist->push_back( new FormattedDiskPageCHPX( wordStream, offset, fib->m_bOlderVersion ) );
+				CHPXlist->push_back( new FormattedDiskPageCHPX( wordStream, offset, fib->m_nWordVersion ) );
 			}
 		}
 		else
@@ -178,7 +176,7 @@ namespace DocFileFormat
 				int offset = fkpnr * 512;
 
 				//parse the FKP and add it to the list
-				CHPXlist->push_back( new FormattedDiskPageCHPX( wordStream, offset, fib->m_bOlderVersion ) );
+				CHPXlist->push_back( new FormattedDiskPageCHPX( wordStream, offset, fib->m_nWordVersion ) );
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPageCHPX.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -50,7 +50,7 @@ namespace DocFileFormat
 
     public:
 	  virtual ~FormattedDiskPageCHPX();
-      FormattedDiskPageCHPX( POLE::Stream* wordStream, int offset, bool oldVersion );
+      FormattedDiskPageCHPX( POLE::Stream* wordStream, int offset, int nWordVersion );
       /// Parses the 0Table (or 1Table) for FKP _entries containing CHPX
       static std::list<FormattedDiskPageCHPX*>* GetAllCHPXFKPs( FileInformationBlock* fib, POLE::Stream* wordStream, POLE::Stream* tableStream );
   };

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -52,59 +52,53 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 	
-	FormattedDiskPagePAPX::FormattedDiskPagePAPX( POLE::Stream* wordStream, int offset, POLE::Stream* dataStream, bool oldVersion, bool fComplex): 
+	FormattedDiskPagePAPX::FormattedDiskPagePAPX( POLE::Stream* wordStream, int offset, POLE::Stream* dataStream, int nWordVersion, bool fComplex): 
 																		FormattedDiskPage(), rgbx(NULL), grppapxSize(0), grppapx(NULL)
-    {
-	  Type = Paragraph;
-      WordStream = wordStream;
+	{
+		Type = Paragraph;
+		WordStream = wordStream;
 
-      //read the 512 bytes (FKP)
-      unsigned char* bytes = NULL;
-	  bytes = new unsigned char[512];
-	  
-	  WordStream->seek( offset);
-      WordStream->read( bytes, 512);
+		//read the 512 bytes (FKP)
+		unsigned char* bytes = NULL;
+		bytes = new unsigned char[512];
 
-      //get the count
-      crun = bytes[511];
+		WordStream->seek( offset);
+		WordStream->read( bytes, 512);
 
-	  //create and fill the array with the adresses
-	  rgfcSize	= crun + 1;
-	  rgfc		= new int[rgfcSize];
+		//get the count
+		crun = bytes[511];
 
-	  int j = 0;
+		//create and fill the array with the adresses
+		rgfcSize	= crun + 1;
+		rgfc		= new int[rgfcSize];
+
+		int j = 0;
       
-	  for ( unsigned int i = 0; i < rgfcSize; i++ )
-      {
-	    rgfc[i] = FormatUtils::BytesToInt32( bytes, j, 512 );
-        j += 4;
-	  }
+		for ( unsigned int i = 0; i < rgfcSize; i++ )
+		{
+			rgfc[i] = FormatUtils::BytesToInt32( bytes, j, 512 );
+			j += 4;
+		}
+		rgbx = new BX[crun];
+		grppapxSize = crun;
+		grppapx = new ParagraphPropertyExceptions*[grppapxSize];
 
-      //create arrays
-      rgbx = new BX[crun];
-	  grppapxSize = crun;
-      grppapx = new ParagraphPropertyExceptions*[grppapxSize];
+		for ( unsigned int i = 0; i < grppapxSize; i++ )
+		{
+			grppapx[i] = NULL;
+		}
 
-	  for ( unsigned int i = 0; i < grppapxSize; i++ )
-	  {
-	    grppapx[i] = NULL;
-	  }
+		j = 4 * ( crun + 1 );
 
-      j = 4 * ( crun + 1 );
-
-	  //read the 12 for PHE
-      unsigned char* phe = NULL;
-	  phe = new unsigned char[12];
-
-      unsigned char* papx = NULL;
+		unsigned char phe[12];
       
-		for ( int i = 0; i < crun; i++ )
+		for ( unsigned char i = 0; i < crun; i++ )
 		{
 			BX bx;
 			bx.wordOffset = bytes[j];
 			j++;
 		
-			if (fComplex || !oldVersion)
+			if (fComplex || nWordVersion == 0)
 			{
 				memcpy( phe, ( bytes + j), 12 );
 
@@ -113,6 +107,13 @@ namespace DocFileFormat
 
 				j += 12;
 			}
+			else if (nWordVersion == 2)
+			{
+				memcpy( phe, ( bytes + bx.wordOffset * 2  + j + 1), 6);
+
+				//fill the rgbx array
+				bx.phe = ParagraphHeight( phe, 6, false );
+			}
 			else
 			{
 				memcpy( phe, ( bytes + j), 6);
@@ -126,29 +127,27 @@ namespace DocFileFormat
 
 			if ( bx.wordOffset != 0 )
 			{
-				//read first unsigned char of PAPX
-				//PAPX is stored in a FKP; so the first unsigned char is a count of words
 				unsigned char padbyte = 0;
 				unsigned char cw = bytes[bx.wordOffset * 2];
-
 				//if that unsigned char is zero, it's a pad unsigned char, and the word count is the following unsigned char
 				if ( cw == 0 )
 				{
 					padbyte = 1;
 					cw = bytes[bx.wordOffset * 2 + 1];
 				}
-
 				if ( cw != 0 )
 				{
+					int sz = cw * 2;
 					//read the bytes for papx
-					papx = new unsigned char[cw * 2];
-					memcpy( papx, ( bytes + (bx.wordOffset * 2) + padbyte + 1 ), ( cw * 2 ) );
+					unsigned char* papx = new unsigned char[sz];
+					memcpy( papx, ( bytes + (bx.wordOffset * 2) + padbyte + 1 ), sz );
 
 					//parse PAPX and fill grppapx
-					grppapx[i] = new ParagraphPropertyExceptions( papx, ( cw * 2 ), dataStream, oldVersion );
+					grppapx[i] = new ParagraphPropertyExceptions( papx, sz, dataStream, nWordVersion );
 
 					RELEASEARRAYOBJECTS( papx );
 				}
+
 			}
 			else
 			{
@@ -157,7 +156,6 @@ namespace DocFileFormat
 			}
 		}
 
-		RELEASEARRAYOBJECTS( phe );
 		RELEASEARRAYOBJECTS( bytes );
 	}
 
@@ -179,7 +177,7 @@ namespace DocFileFormat
 	
 	  //there are n offsets and n-1 fkp's in the bin table
 
-	  if (fib->m_bOlderVersion && fib->m_FibBase.fComplex == false)
+	  if (fib->m_nWordVersion > 0 && fib->m_FibBase.fComplex == false)
 	  {
 			int	n		= ( ( (int)fib->m_FibWord97.lcbPlcfBtePapx - 8 ) / 6 ) + 1;
 
@@ -202,7 +200,7 @@ namespace DocFileFormat
 				int offset = fkpnr * 512;
 
 				//parse the FKP and add it to the list
-				PAPXlist->push_back( new FormattedDiskPagePAPX( wordStream, offset, dataStream, fib->m_bOlderVersion, fib->m_FibBase.fComplex) );
+				PAPXlist->push_back( new FormattedDiskPagePAPX( wordStream, offset, dataStream, fib->m_nWordVersion, fib->m_FibBase.fComplex) );
 			}
 
 			//if (PAPXlist->back()->rgfc[PAPXlist->back()->rgfcSize-1] < last)
@@ -226,7 +224,7 @@ namespace DocFileFormat
 			int offset = fkpnr * 512;
 
 			//parse the FKP and add it to the list
-			PAPXlist->push_back( new FormattedDiskPagePAPX( wordStream, offset, dataStream, fib->m_bOlderVersion, fib->m_FibBase.fComplex) );
+			PAPXlist->push_back( new FormattedDiskPagePAPX( wordStream, offset, dataStream, fib->m_nWordVersion, fib->m_FibBase.fComplex) );
 		  }
 
 	  }

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -63,7 +63,7 @@ namespace DocFileFormat
 
     public:
       virtual ~FormattedDiskPagePAPX();
-	  FormattedDiskPagePAPX( POLE::Stream* wordStream, int offset, POLE::Stream* dataStream, bool oldVersion, bool fComplex);
+	  FormattedDiskPagePAPX( POLE::Stream* wordStream, int offset, POLE::Stream* dataStream, int nWordVersion, bool fComplex);
       /// Parses the 0Table (or 1Table) for FKP _entries containing PAPX
       static std::list<FormattedDiskPagePAPX*>* GetAllPAPXFKPs( FileInformationBlock* fib, POLE::Stream* wordStream, POLE::Stream* tableStream, POLE::Stream* dataStream);
       /// Returns a list of all PAPX FCs between they given boundaries.

ASCOfficeDocFile/DocDocxConverter/Global.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -38,10 +38,30 @@ namespace Global
 	static const wchar_t ColorIdentifier[17][12] = 
 	{
         L"auto",
+        L"000000",//L"black",
+        L"0000FF",//L"blue",
+        L"00FFFF",//L"cyan",
+		L"00FF00",// L"green",
+        L"FF00FF",//L"magenta",
+        L"FF0000",//L"red",
+        L"FFFF00",//L"yellow",
+        L"FFFFFF",//L"white",
+        L"darkBlue",
+        L"darkCyan",
+        L"darkGreen",
+        L"darkMagenta",
+        L"darkRed",
+        L"darkYellow",
+        L"darkGray",
+        L"lightGray"
+	};
+	static const wchar_t ColorNameIdentifier[17][12] = 
+	{
+        L"auto",
         L"black",
         L"blue",
         L"cyan",
-        L"green",
+		L"green",
         L"magenta",
         L"red",
         L"yellow",
@@ -55,7 +75,6 @@ namespace Global
         L"darkGray",
         L"lightGray"
 	};
-
 	static const wchar_t UnderlineCode[56][16] =
 	{
         L"none",

ASCOfficeDocFile/DocDocxConverter/HeaderAndFooterTable.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -38,110 +38,83 @@ namespace DocFileFormat
 {
 	HeaderAndFooterTable::HeaderAndFooterTable (FileInformationBlock* fib, POLE::Stream* pTableStream)
 	{
-		VirtualStreamReader tableReader (pTableStream, fib->m_FibWord97.fcPlcfHdd, fib->m_bOlderVersion);
+		m_nCurrentIndex = 0;
+
+		VirtualStreamReader tableReader (pTableStream, fib->m_FibWord97.fcPlcfHdd, fib->m_nWordVersion);
 
 		if (fib->m_FibWord97.fcPlcfHdd > tableReader.GetSize()) return;
 
 		unsigned int tableSize	=	fib->m_FibWord97.lcbPlcfHdd / 4;//in bytes
 
-		if ( ( tableSize > 0 ) && ( fib->m_RgLw97.ccpHdr > 0 ) )
+		if ( tableSize < 1  || fib->m_RgLw97.ccpHdr <1 )
+			return;
+
+		int* table = new int[tableSize];
+
+		for (unsigned int i = 0; i < tableSize; ++i)
 		{
-			int* table			=	new int[tableSize];
-
-			for (unsigned int i = 0; i < tableSize; ++i)
-			{
-				table[i]		=	tableReader.ReadInt32();
-			}
-
-			int initialPos		=	fib->m_RgLw97.ccpText + fib->m_RgLw97.ccpFtn;
-
-
-			//the first 6 _entries are about footnote and endnote formatting
-			//so skip these _entries
-			int pos = (fib->m_FibBase.fComplex || !fib->m_bOlderVersion) ? 6 : 0;
-			
-			int count			=	( tableSize - pos - 2) / 6;
-			
-			for (int i = 0; i < count; ++i)
-			{
-				//Even Header
-				if ( table[pos] == table[pos + 1] )
-				{
-					m_arEvenHeaders.push_back( NULL );
-				}
-				else
-				{
-					m_arEvenHeaders.push_back( new CharacterRange( ( initialPos + table[pos] ), ( table[pos + 1] - table[pos] ) ) );
-				}
-
-				pos++;
-
-				//Odd Header
-				if ( table[pos] == table[pos + 1] )
-				{
-					m_arOddHeaders.push_back( NULL );
-				}
-				else
-				{
-					m_arOddHeaders.push_back( new CharacterRange( ( initialPos + table[pos] ), ( table[pos + 1] - table[pos] ) ) );
-				}
-
-				pos++;
-
-				//Even Footer
-				if ( table[pos] == table[pos + 1] )
-				{
-					m_arEvenFooters.push_back( NULL );
-				}
-				else
-				{
-					m_arEvenFooters.push_back( new CharacterRange( ( initialPos + table[pos] ), ( table[pos + 1] - table[pos] ) ) );
-				}
-
-				pos++;
-
-				//Odd Footer
-				if ( table[pos] == table[pos + 1] )
-				{
-					m_arOddFooters.push_back( NULL );
-				}
-				else
-				{
-					m_arOddFooters.push_back( new CharacterRange( ( initialPos + table[pos] ), ( table[pos + 1] - table[pos] ) ) );
-				}
-
-				pos++;
-
-				//First Page Header
-				if ( table[pos] == table[pos + 1] )
-				{
-					m_arFirstHeaders.push_back (NULL);
-				}
-				else
-				{
-					m_arFirstHeaders.push_back (new CharacterRange( ( initialPos + table[pos] ), ( table[pos + 1] - table[pos] ) ));
-				}
-
-				pos++;
-
-				if (pos >= tableSize)
-					break;
-
-				//First Page Footers
-				if ( table[pos] == table[pos + 1] )
-				{
-					m_arFirstFooters.push_back( NULL );
-				}
-				else
-				{
-					m_arFirstFooters.push_back( new CharacterRange( ( initialPos + table[pos] ), ( table[pos + 1] - table[pos] ) ) );
-				}
-
-				pos++;
-			}
-
-			RELEASEARRAYOBJECTS(table);
+			table[i] = tableReader.ReadInt32();
 		}
+
+		int initialPos = fib->m_RgLw97.ccpText + fib->m_RgLw97.ccpFtn;
+
+		int count	=	0;
+		int pos		= (fib->m_FibBase.fComplex || fib->m_nWordVersion == 0) ? 6 : 0;
+				//the first 6 _entries are about footnote and endnote formatting -Word97 so skip these		
+
+		std::vector<std::vector<CharacterRange*>*> arHeadersFooters;
+		
+		if (fib->m_nWordVersion == 2)
+		{
+			count =	( tableSize - 1);
+		}
+		else
+		{
+			count =	( tableSize - pos - 1) / 6;
+
+			arHeadersFooters.push_back(&m_arEvenHeaders);
+			arHeadersFooters.push_back(&m_arOddHeaders);
+			arHeadersFooters.push_back(&m_arEvenFooters);
+			arHeadersFooters.push_back(&m_arOddFooters);
+			arHeadersFooters.push_back(&m_arFirstHeaders);
+			arHeadersFooters.push_back(&m_arFirstFooters);
+		}
+		
+		for (int i = 0; i < count; ++i)
+		{
+	//Even Header
+			if (fib->m_nWordVersion == 2)
+			{
+				if ( table[pos] == table[pos + 1] )
+				{
+					m_arCommonHeadersFooters.push_back( NULL );
+				}
+				else
+				{
+					m_arCommonHeadersFooters.push_back( new CharacterRange( initialPos + table[pos], table[pos + 1] - table[pos]) );
+				}
+				pos++;
+			}
+			else
+			{
+				for (size_t j = 0; j < 6; j++)
+				{
+					if ( table[pos] == table[pos + 1] )
+					{
+						arHeadersFooters[j]->push_back( NULL );
+					}
+					else
+					{
+						arHeadersFooters[j]->push_back( new CharacterRange( initialPos + table[pos], table[pos + 1] - table[pos]) );
+					}
+					pos++;
+
+					if (pos >= tableSize) break;
+				}
+			}
+			if (pos >= tableSize) break;
+		}
+		RELEASEARRAYOBJECTS(table);
 	}
 
 	HeaderAndFooterTable::~HeaderAndFooterTable()
@@ -152,5 +125,7 @@ namespace DocFileFormat
 		for_each (m_arFirstHeaders.begin(), m_arFirstHeaders.end(), DeleteDynamicObject());
 		for_each (m_arOddFooters.begin(),   m_arOddFooters.end(),   DeleteDynamicObject());
 		for_each (m_arOddHeaders.begin(),   m_arOddHeaders.end(),   DeleteDynamicObject());
+
+		for_each (m_arCommonHeadersFooters.begin(), m_arCommonHeadersFooters.end(), DeleteDynamicObject());		
 	}
 }

ASCOfficeDocFile/DocDocxConverter/HeaderAndFooterTable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,10 +34,12 @@
 #include "CharacterRange.h"
 #include "FileInformationBlock.h"
 
-#define GET_CHARS_RANGE(NAME) inline CharacterRange* Get##NAME(int nIndex)	{\
+#define GET_CHARS_RANGE(NAME) inline CharacterRange* Get##NAME(int nIndex)\
+{\
 	if (m_ar##NAME.empty())					return NULL;	\
 	if (nIndex < (int)m_ar##NAME.size())	return m_ar##NAME[nIndex];\
-	return NULL;	}	\
+	return NULL;	\
+}\
 
 namespace DocFileFormat
 {
@@ -54,8 +56,17 @@ namespace DocFileFormat
 		GET_CHARS_RANGE (EvenFooters);
 		GET_CHARS_RANGE (OddFooters);
 
+	inline CharacterRange* GetNextHeaderFooter()
+	{
+		if (m_nCurrentIndex < m_arCommonHeadersFooters.size())	
+			return m_arCommonHeadersFooters[m_nCurrentIndex++];
+		
+		return NULL;
+	}
 	private: 
-
+		size_t							m_nCurrentIndex;
+		std::vector<CharacterRange*>	m_arCommonHeadersFooters;
+	
 		std::vector<CharacterRange*> m_arFirstHeaders;
 		std::vector<CharacterRange*> m_arEvenHeaders;
 		std::vector<CharacterRange*> m_arOddHeaders;

ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -45,16 +45,16 @@ namespace DocFileFormat
 		m_document = static_cast<WordDocument*>( visited );
 
 		//start the document
-		m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) );
-		m_pXmlWriter->WriteNodeBegin( _T( "w:hdr" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
+        m_pXmlWriter->WriteNodeBegin( L"w:hdr", TRUE );
 
 		//write namespaces
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships );
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+        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->WriteNodeEnd( L"", TRUE, FALSE );
 
 		//convert the header text
 		_lastValidPapx	=	(*(m_document->AllPapxFkps->begin()))->grppapx[0];
@@ -71,7 +71,7 @@ namespace DocFileFormat
 			if (fc < 0) break;
 
 			ParagraphPropertyExceptions* papx = findValidPapx( fc );
-			TableInfo tai( papx );
+			TableInfo tai( papx, m_document->nWordVersion );
 
 			if ( tai.fInTable )
 			{
@@ -84,12 +84,12 @@ namespace DocFileFormat
 			else
 			{
 				//this PAPX is for a normal paragraph
-				cp = writeParagraph( cp );
+				cp = writeParagraph( cp, 0x7fffffff );
 			}
 		}
 
-		m_pXmlWriter->WriteNodeEnd( _T( "w:hdr" ) );
+        m_pXmlWriter->WriteNodeEnd( L"w:hdr");
 
 		m_context->_docx->HeaderXMLList.push_back( std::wstring( m_pXmlWriter->GetXmlString() ) );
 	}
-}
+}

ASCOfficeDocFile/DocDocxConverter/HeaderMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/IBinaryReader.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/IMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/IVisitable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -33,6 +33,9 @@
 
 #include "IMapping.h"
 
+#define GETBITS(from, numL, numH) ((from & (((1 << (numH - numL + 1)) - 1) << numL)) >> numL)
+#define GETBIT(from, num) ((from & (1 << num)) != 0)
+
 namespace DocFileFormat
 {
     class IVisitable

ASCOfficeDocFile/DocDocxConverter/LanguageId.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -40,7 +40,7 @@ namespace DocFileFormat
 		_type = type;
 	}
 
-	LanguageIdMapping::LanguageIdMapping (XMLTools::XMLElement<wchar_t>* parentElement, LanguageType type) : PropertiesMapping(NULL)
+    LanguageIdMapping::LanguageIdMapping (XMLTools::XMLElement* parentElement, LanguageType type) : PropertiesMapping(NULL)
 	{
 		_parent = parentElement;
 		_type = type;
@@ -59,31 +59,31 @@ namespace DocFileFormat
 		{
 			std::wstring langcode = getLanguageCode( dynamic_cast<LanguageId*>( lid ) );
 
-			XMLTools::XMLAttribute<wchar_t>* att = NULL;
+            XMLTools::XMLAttribute* att = NULL;
 
 			switch ( _type )
 			{
 			case Default:
 				{
-                    att = new XMLTools::XMLAttribute<wchar_t>( L"w:val", langcode.c_str() );
+                    att = new XMLTools::XMLAttribute( L"w:val", langcode);
 				}
 				break;
 
 			case EastAsian:
 				{                    
-                    att = new XMLTools::XMLAttribute<wchar_t>( L"w:eastAsia", langcode.c_str() );
+                    att = new XMLTools::XMLAttribute( L"w:eastAsia", langcode);
 				}
 				break;
 
 			case Complex:
 				{
-                    att = new XMLTools::XMLAttribute<wchar_t>( L"w:bidi", langcode.c_str() );
+                    att = new XMLTools::XMLAttribute( L"w:bidi", langcode);
 				}
 				break;
 
 			default:
 				{    
-                    att = new XMLTools::XMLAttribute<wchar_t>( L"w:val", langcode.c_str() );
+                    att = new XMLTools::XMLAttribute( L"w:val", langcode);
 				}
 				break;
 			}
@@ -91,7 +91,7 @@ namespace DocFileFormat
 			if (m_pXmlWriter)
 			{
 				// !!!TODO!!!
-				m_pXmlWriter->WriteString( att->GetXMLString().c_str() );
+				m_pXmlWriter->WriteString( att->GetXMLString());
 			}
 			else if ( _parent != NULL )
 			{

ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -49,14 +49,14 @@ namespace DocFileFormat
 	{
 	public: 
 		LanguageIdMapping( XMLTools::CStringXmlWriter* writer, LanguageType type );
-		LanguageIdMapping( XMLTools::XMLElement<wchar_t>* parentElement, LanguageType type );
+        LanguageIdMapping( XMLTools::XMLElement* parentElement, LanguageType type );
 		virtual ~LanguageIdMapping();
 		void Apply( IVisitable* lid );
 
 		static std::wstring getLanguageCode( LanguageId* lid );
 	
 	private: 
-		LanguageType _type;
-		XMLTools::XMLElement<wchar_t>* _parent;
+        LanguageType            _type;
+        XMLTools::XMLElement*   _parent;
 	}; 
 }

ASCOfficeDocFile/DocDocxConverter/LineSpacingDescriptor.h

@@ -1,5 +1,5 @@
 /*
-* (c) Copyright Ascensio System SIA 2010-2016
+* (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/ListData.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -152,37 +152,53 @@ namespace DocFileFormat
 	}
 	OutlineListDescriptor::OutlineListDescriptor( unsigned char * data, int length )
 	{
-		int pos = 0;
+		if (length < 212)
+		{
+			//int sz  =  FormatUtils::BytesToUChar(data, 0, length);
+			int pos = 0;
 
-		for (int i = 0 ; i < 9; i++)
-		{
-            lvl[i].Parse(data + pos, length - pos);
-			pos += 16;
+			for (int i = 0 ; i < 9; i++)
+			{
+				lvl[i].Parse(data + pos, 1);
+				pos += 1;
+			}
 		}
+		else
+		{
+			int pos = 0;
 
-        fRestartHdr	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
-		fSpareOlst2	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
-		fSpareOlst3	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
-		fSpareOlst4	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
-		
-		short strLen = length - pos;
-		
-		while (strLen > 0)
-		{
-			if (data[strLen + 20 - 1] != 0)
-				break;
-			strLen--;
+			for (int i = 0 ; i < 9; i++)
+			{
+				lvl[i].Parse(data + pos, length - pos);
+				pos += 16;
+			}
+
+			fRestartHdr	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
+			fSpareOlst2	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
+			fSpareOlst3	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
+			fSpareOlst4	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
+			
+			short strLen = length - pos;
+			
+			while (strLen > 0)
+			{
+				if (data[strLen + 20 - 1] != 0)
+					break;
+				strLen--;
+			}
+			if (strLen > 0)
+			{
+				FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &(xst), data + 20, ( strLen ), ENCODING_WINDOWS_1250);
+			}	
 		}
-		if (strLen > 0)
-		{
-			FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &(xst), data + 20, ( strLen ), ENCODING_WINDOWS_1250);
-		}	
 	}
 
 	ByteStructure* OutlineListDescriptor::ConstructObject(VirtualStreamReader* reader, int length)
 	{
-		unsigned char *data = reader->ReadBytes(212, true);
-		OutlineListDescriptor *newObject = new OutlineListDescriptor(data, 212);
+		int sz = GetSize(reader->nWordVersion);
+
+		unsigned char *data = reader->ReadBytes(sz, true);
+		OutlineListDescriptor *newObject = new OutlineListDescriptor(data, sz);
 
 		delete []data;
 

ASCOfficeDocFile/DocDocxConverter/ListData.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -143,8 +143,13 @@ namespace DocFileFormat
 
 		std::wstring	xst; //64 chars ansi
 
-	public:
 		static const int STRUCTURE_SIZE = 212;
+		static const int STRUCTURE_SIZE_OLD = 10;
+    public:
+		static const int GetSize(int nWordVersion)
+		{
+			return (nWordVersion == 2) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
+		}
         virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
 		
 		virtual ~OutlineListDescriptor();

ASCOfficeDocFile/DocDocxConverter/ListFormatOverride.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/ListFormatOverrideLevel.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/ListFormatOverrideTable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -49,7 +49,7 @@ namespace DocFileFormat
       {
 	    if ( fib->m_FibWord97.lcbPlfLfo > 0 )
         {
-	      VirtualStreamReader reader( tableStream, fib->m_FibWord97.fcPlfLfo, fib->m_bOlderVersion);
+	      VirtualStreamReader reader( tableStream, fib->m_FibWord97.fcPlfLfo, fib->m_nWordVersion);
             
 		  if (fib->m_FibWord97.fcPlfLfo > reader.GetSize()) return;
             

ASCOfficeDocFile/DocDocxConverter/ListLevel.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -77,7 +77,7 @@ namespace DocFileFormat
 		//this papx has no istd, so use PX to parse it
 		unsigned char *bytes	= reader->ReadBytes( cbGrpprlPapx, true );
 
-		PropertyExceptions* px	= new PropertyExceptions( bytes, cbGrpprlPapx, reader->olderVersion);
+		PropertyExceptions* px	= new PropertyExceptions( bytes, cbGrpprlPapx, reader->nWordVersion);
 		grpprlPapx				= new ParagraphPropertyExceptions( *(px->grpprl) );
 
 		RELEASEOBJECT( px );
@@ -85,7 +85,7 @@ namespace DocFileFormat
 
 		//read the group of chpx sprms
 		bytes = reader->ReadBytes( cbGrpprlChpx, true );
-		grpprlChpx = new CharacterPropertyExceptions( bytes, cbGrpprlChpx, reader->olderVersion );
+		grpprlChpx = new CharacterPropertyExceptions( bytes, cbGrpprlChpx, reader->nWordVersion );
 		RELEASEARRAYOBJECTS( bytes );
 
 		//read the number text
@@ -116,6 +116,10 @@ namespace DocFileFormat
 
     void NumberingLevelDescriptor::Parse(unsigned char * data, int length )
     {
+		if (length < 16)
+		{
+			return;
+		}
         bEnabled        = true;
 
         nfc				= FormatUtils::BytesToUChar(data, 0, length);

ASCOfficeDocFile/DocDocxConverter/ListLevel.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/ListTable.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -45,7 +45,7 @@ namespace DocFileFormat
 	{
 		if ( fib->m_FibWord97.lcbPlfLst > 0 )
 		{
-			VirtualStreamReader reader( tableStream, fib->m_FibWord97.fcPlfLst, fib->m_bOlderVersion);
+			VirtualStreamReader reader( tableStream, fib->m_FibWord97.fcPlfLst, fib->m_nWordVersion);
 			
 			if (fib->m_FibWord97.fcPlfLst > reader.GetSize()) return;
 

ASCOfficeDocFile/DocDocxConverter/ListTable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -50,36 +50,49 @@ namespace DocFileFormat
 	void MainDocumentMapping::Apply(IVisitable* visited)
 	{
 		m_document = static_cast<WordDocument*>(visited);
-		m_context->_docx->RegisterDocument();
-
+		
 		// Header
-		m_pXmlWriter->WriteNodeBegin(_T("?xml version=\"1.0\" encoding=\"UTF-8\"?"));
-		m_pXmlWriter->WriteNodeBegin(_T("w:document"), TRUE );
+		m_pXmlWriter->WriteNodeBegin(L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
+		m_pXmlWriter->WriteNodeBegin(L"w:document", TRUE );
 
 		// Namespaces
-		m_pXmlWriter->WriteAttribute(_T("xmlns:w"),		OpenXmlNamespaces::WordprocessingML );
-		m_pXmlWriter->WriteAttribute(_T("xmlns:v"),		OpenXmlNamespaces::VectorML );
-		m_pXmlWriter->WriteAttribute(_T("xmlns:o"),		OpenXmlNamespaces::Office );
-		m_pXmlWriter->WriteAttribute(_T("xmlns:w10"),	OpenXmlNamespaces::OfficeWord );
-		m_pXmlWriter->WriteAttribute(_T("xmlns:r"),		OpenXmlNamespaces::Relationships );
-		m_pXmlWriter->WriteAttribute(_T("xmlns:m"),		_T("http://schemas.openxmlformats.org/officeDocument/2006/math"));
+		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:m",		L"http://schemas.openxmlformats.org/officeDocument/2006/math");
 
-		//m_pXmlWriter->WriteAttribute(_T("xmlns:wpc"),	_T("http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas"));
-		//m_pXmlWriter->WriteAttribute(_T("xmlns:mc"),	_T("http://schemas.openxmlformats.org/markup-compatibility/2006")); 
-		//m_pXmlWriter->WriteAttribute(_T("xmlns:wp14"),_T("http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"));
-		//m_pXmlWriter->WriteAttribute(_T("xmlns:wp"),	_T("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"));
-		//m_pXmlWriter->WriteAttribute(_T("xmlns:w14"),	_T("http://schemas.microsoft.com/office/word/2010/wordml"));
-		//m_pXmlWriter->WriteAttribute(_T("xmlns:wpg"),	_T("http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"));
-		//m_pXmlWriter->WriteAttribute(_T("xmlns:wpi"),	_T("http://schemas.microsoft.com/office/word/2010/wordprocessingInk"));
-		//m_pXmlWriter->WriteAttribute(_T("xmlns:wne"),	_T("http://schemas.microsoft.com/office/word/2006/wordml"));
-		//m_pXmlWriter->WriteAttribute(_T("xmlns:wps"),	_T("http://schemas.microsoft.com/office/word/2010/wordprocessingShape"));
-		//m_pXmlWriter->WriteAttribute(_T("mc:Ignorable"), _T("w14 wp14"));
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wpc",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:mc",		L"http://schemas.openxmlformats.org/markup-compatibility/2006"); 
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wp14",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wp",		L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:w14",	L"http://schemas.microsoft.com/office/word/2010/wordml");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wpg",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wpi",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wne",	L"http://schemas.microsoft.com/office/word/2006/wordml");
+		//m_pXmlWriter->WriteAttribute(L"xmlns:wps",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape");
+		//m_pXmlWriter->WriteAttribute(L"mc:Ignorable", L"w14 wp14");
 		
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+		m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
-		m_pXmlWriter->WriteNodeBegin( _T("w:body"), FALSE );
+		if ((m_document->GetOfficeArt()) && (m_document->GetOfficeArt()->GetShapeBackgound()))
+		{
+			m_document->DocProperties->bDisplayBackgroundShape = true;
+			ShapeContainer* pShape = m_document->GetOfficeArt()->GetShapeBackgound();
 
-		// Convert the document
+			m_pXmlWriter->WriteNodeBegin ( L"w:background", TRUE);
+				m_pXmlWriter->WriteAttribute	( L"w:color", L"FFFFFF");
+			m_pXmlWriter->WriteNodeEnd( L"",  TRUE, FALSE );
+			
+			VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, NULL,  _caller);
+				pShape->Convert(&oVmlWriter);
+			m_pXmlWriter->WriteNodeEnd (L"w:background");
+		}
+
+		m_pXmlWriter->WriteNodeBegin( L"w:body", FALSE );
+
+// Convert the document
 		_lastValidPapx = NULL;
 		if (m_document->AllPapxFkps->empty() == false)
 		{
@@ -97,7 +110,7 @@ namespace DocFileFormat
 		int countText		=	m_document->FIB->m_RgLw97.ccpText;
 		int countTextRel	=	m_document->FIB->m_RgLw97.ccpText - 1;
 							
-		while (cp < countText)
+		while (cp < countText && cp >= 0)
 		{
 			fc = m_document->FindFileCharPos(cp);
 				
@@ -107,19 +120,22 @@ namespace DocFileFormat
 
 			if (papx)
 			{
-				TableInfo tai(papx);
+				TableInfo tai(papx, m_document->nWordVersion);
 				if (tai.fInTable)
 				{
+					int cpStart = cp;
 					//this PAPX is for a table
 					//cp = writeTable( cp, tai.iTap );
 					Table table( this, cp, ( ( tai.iTap > 0 ) ? ( 1 ) : ( 0 ) ) );
 					table.Convert(this);
 					cp = table.GetCPEnd();
+					while (cp <= cpStart)	//conv_eznHsm8em2unSv6_2QE__docx.doc
+						cp++;
 				}
 				else
 				{
 					//this PAPX is for a normal paragraph
-					cp = writeParagraph(cp);
+					cp = writeParagraph(cp, countTextRel);
 				}
 			}
 			else
@@ -175,8 +191,8 @@ namespace DocFileFormat
 			}
 		}
 
-		m_pXmlWriter->WriteNodeEnd( _T( "w:body" ) );
-		m_pXmlWriter->WriteNodeEnd( _T( "w:document" ) );
+		m_pXmlWriter->WriteNodeEnd( L"w:body" );
+		m_pXmlWriter->WriteNodeEnd( L"w:document" );
 
 		m_context->_docx->DocumentXML = std::wstring(m_pXmlWriter->GetXmlString());
 	}

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/MemoryStream.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -72,7 +72,7 @@ public:
 
 		if (m_Data)
 		{
-			rdUShort	=	FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
+            rdUShort	=	DocFileFormat::FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUShort);
 		}
 
@@ -85,7 +85,7 @@ public:
 
 		if (m_Data)
 		{
-			rdShort		=	FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
+            rdShort		=	DocFileFormat::FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdShort);
 		}
 
@@ -98,7 +98,7 @@ public:
 
 		if (m_Data)
 		{
-			rdInt		=	FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
+            rdInt		=	DocFileFormat::FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdInt);
 		}
 
@@ -111,7 +111,7 @@ public:
 
 		if (m_Data )
 		{
-			rdUInt		=	FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
+            rdUInt		=	DocFileFormat::FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUInt);
 		}
 
@@ -124,7 +124,7 @@ public:
 
 		if (m_Data)
 		{
-			rdByte		=	m_Data[m_Position];
+			rdByte		=	(m_Position < m_Size) ? m_Data[m_Position] : 0;
 			m_Position	+=	sizeof(rdByte);
 		}
 

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -38,8 +38,8 @@ namespace DocFileFormat
 	{
 		if (m_context)
 		{
-			m_document		=	m_context->GetDocument();
-			m_xmldocument	=	m_context->GetXmlDocument();
+			m_document		=	m_context->_doc;
+			m_xmldocument	=	m_context->_docx;
 		}
 	}
 
@@ -63,17 +63,17 @@ namespace DocFileFormat
 			m_xmldocument->RegisterNumbering();
 
 			//start the document
-			m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); 
-			m_pXmlWriter->WriteNodeBegin( _T( "w:numbering" ), TRUE );
+            m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
+            m_pXmlWriter->WriteNodeBegin( L"w:numbering", TRUE );
 
 			//write namespaces
-			m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
-			m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML );
-			m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office );
-			m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord );
-			m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships );
+            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->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+            m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 			PictureBulletsMapping();
 
@@ -82,37 +82,37 @@ namespace DocFileFormat
 			for (std::list<ListData*>::iterator iter = rglst->listData.begin(); iter != rglst->listData.end(); ++iter, ++i)
 			{
 				//start abstractNum
-				m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNum" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:abstractNumId" ), FormatUtils::IntToWideString( i ).c_str() );
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                m_pXmlWriter->WriteNodeBegin( L"w:abstractNum", TRUE );
+                m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::IntToWideString( i ));
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				//nsid
-				m_pXmlWriter->WriteNodeBegin( _T( "w:nsid" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->lsid, _T( "%08x" ) ).c_str() );
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+                m_pXmlWriter->WriteNodeBegin( L"w:nsid", TRUE );
+                m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( (*iter)->lsid, L"%08x" ));
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				//multiLevelType
-				m_pXmlWriter->WriteNodeBegin( _T( "w:multiLevelType" ), TRUE );
+                m_pXmlWriter->WriteNodeBegin( L"w:multiLevelType", TRUE );
 
 				if ( (*iter)->fHybrid )
 				{
-					m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "hybridMultilevel" ) );
+                    m_pXmlWriter->WriteAttribute( L"w:val", L"hybridMultilevel" );
 				}
 				else if ( (*iter)->fSimpleList )
 				{
-					m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "singleLevel" ) );
+                    m_pXmlWriter->WriteAttribute( L"w:val", L"singleLevel" );
 				}
 				else
 				{
-					m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "multilevel" ) );
+                    m_pXmlWriter->WriteAttribute( L"w:val", L"multilevel" );
 				}
 
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				//template
-				m_pXmlWriter->WriteNodeBegin( _T( "w:tmpl" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->tplc, _T( "%08x" ) ).c_str());
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+                m_pXmlWriter->WriteNodeBegin( L"w:tmpl", TRUE );
+                m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( (*iter)->tplc, L"%08x"));
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				// writes the levels
 				size_t length = (*iter)->rglvl->size();
@@ -124,33 +124,33 @@ namespace DocFileFormat
 				}
 
 				//end abstractNum
-				m_pXmlWriter->WriteNodeEnd( _T( "w:abstractNum" ) );
+                m_pXmlWriter->WriteNodeEnd( L"w:abstractNum" );
 			}
 			//write old style numbering (сложносоставных не сущестует)
 			for (std::list<NumberingDescriptor>::iterator iter = rglst->listNumbering.begin(); iter != rglst->listNumbering.end(); ++iter, ++i)
 			{
 				//start abstractNum
-				m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNum" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:abstractNumId" ), FormatUtils::IntToWideString( i ).c_str() );
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                m_pXmlWriter->WriteNodeBegin( L"w:abstractNum", TRUE );
+                m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::IntToWideString( i ));
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				////nsid
-				//m_pXmlWriter->WriteNodeBegin( _T( "w:nsid" ), TRUE );
-				//m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->lsid, _T( "%08x" ) ).c_str() );
-				//m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+                //m_pXmlWriter->WriteNodeBegin( L"w:nsid", TRUE );
+                //m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( (*iter)->lsid, L"%08x" ) ));
+                //m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				//multiLevelType
-				m_pXmlWriter->WriteNodeBegin( _T( "w:multiLevelType" ), TRUE );
+                m_pXmlWriter->WriteNodeBegin( L"w:multiLevelType", TRUE );
 				{
-					m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "singleLevel" ) );
+                    m_pXmlWriter->WriteAttribute( L"w:val", L"singleLevel" );
 				}
 
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				LevelMapping(*iter, 0);
 
 				//end abstractNum
-				m_pXmlWriter->WriteNodeEnd( _T( "w:abstractNum" ) );
+                m_pXmlWriter->WriteNodeEnd( L"w:abstractNum" );
 			}
 
 			//write the overrides
@@ -159,36 +159,36 @@ namespace DocFileFormat
 				ListFormatOverride* lfo = m_document->listFormatOverrideTable->at(i);
 
 				//start num
-				m_pXmlWriter->WriteNodeBegin( _T( "w:num" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:numId" ), FormatUtils::IntToWideString(i + 1).c_str());
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                m_pXmlWriter->WriteNodeBegin( L"w:num", TRUE );
+                m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::IntToWideString(i + 1));
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				int index = FindIndexbyId( rglst->listData, lfo->lsid );
 
-				m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNumId" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( index ).c_str() );
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+                m_pXmlWriter->WriteNodeBegin( L"w:abstractNumId", TRUE );
+                m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString( index ) );
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 				for (std::vector<ListFormatOverrideLevel*>::const_iterator iter = lfo->rgLfoLvl.begin(); iter != lfo->rgLfoLvl.end(); ++iter)
 				{
-					m_pXmlWriter->WriteNodeBegin( _T( "w:lvlOverride" ), TRUE );
+                    m_pXmlWriter->WriteNodeBegin( L"w:lvlOverride", TRUE );
 
-					m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString( (*iter)->ilvl ).c_str() );
-					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                    m_pXmlWriter->WriteAttribute( L"w:ilvl", FormatUtils::IntToWideString( (*iter)->ilvl ));
+                    m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 					if ( ( (*iter)->fStartAt ) && ( !(*iter)->fFormatting ) )
 					{
-						m_pXmlWriter->WriteNodeBegin( _T( "w:startOverride" ), TRUE );
-						m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( (*iter)->iStartAt ).c_str() );
-						m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+                        m_pXmlWriter->WriteNodeBegin( L"w:startOverride", TRUE );
+                        m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString( (*iter)->iStartAt ));
+                        m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 					}
 
 					LevelMapping((*iter)->lvl, 0, ListData::ISTD_NIL);
 
-					m_pXmlWriter->WriteNodeEnd(_T("w:lvlOverride"));
+                    m_pXmlWriter->WriteNodeEnd(L"w:lvlOverride");
 				}
 
-				m_pXmlWriter->WriteNodeEnd(_T( "w:num"));
+                m_pXmlWriter->WriteNodeEnd(L"w:num");
 			}
 
 			if (m_document->listFormatOverrideTable->empty() &&  !rglst->listNumbering.empty())
@@ -196,20 +196,20 @@ namespace DocFileFormat
 				i = 0;
 				for (std::list<NumberingDescriptor>::iterator iter = rglst->listNumbering.begin(); iter != rglst->listNumbering.end(); ++iter, ++i)
 				{
-					m_pXmlWriter->WriteNodeBegin( _T( "w:num" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:numId" ), FormatUtils::IntToWideString(i+1).c_str());
-					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                    m_pXmlWriter->WriteNodeBegin( L"w:num", TRUE );
+                    m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::IntToWideString(i+1));
+                    m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 
-					m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNumId" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( i ).c_str() );
-					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+                    m_pXmlWriter->WriteNodeBegin( L"w:abstractNumId", TRUE );
+                    m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString( i ));
+                    m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
-					m_pXmlWriter->WriteNodeEnd(_T( "w:num"));
+                    m_pXmlWriter->WriteNodeEnd(L"w:num");
 				}
 			}
 
-			m_pXmlWriter->WriteNodeEnd(_T("w:numbering"));
+            m_pXmlWriter->WriteNodeEnd(L"w:numbering");
 
 			m_xmldocument->NumberingXML = std::wstring(m_pXmlWriter->GetXmlString());
 		}
@@ -255,8 +255,10 @@ namespace DocFileFormat
 
 					if (!FormatUtils::IsControlSymbol(xchBullet))
 					{
-						ret.push_back(lvl->xst[0]);
-						ret.push_back(L'\0');
+						ret.push_back(lvl->xst[0]);//??? xchBullet
+					}
+					else
+					{
 					}
 				}
 			}
@@ -275,7 +277,7 @@ namespace DocFileFormat
 				{
 					newResult = find_if((result + 1), lvl->xst.end(), &NumberingMapping::IsPlaceholder);
 
-					ret += _T( "%" );
+                    ret += L"%";
 					ret += FormatUtils::IntToWideString(*result + 1);
 					ret += std::wstring((result + 1), newResult);
 					result = newResult;
@@ -305,13 +307,11 @@ namespace DocFileFormat
 				if (!FormatUtils::IsControlSymbol(xchBullet))
 				{
 					ret.push_back(lvl.xst[0]);
-					ret.push_back(L'\0');
 				}
 			}
 			else
 			{
 				ret.push_back(L'\xF0B7');
-				ret.push_back(L'\0');
 			}
 		}
 		else
@@ -319,7 +319,7 @@ namespace DocFileFormat
 			std::wstring strBefore		=	lvl.xst.substr(0, Before);
 			std::wstring strAfter		=	lvl.xst.substr(Before, After);
 
-			ret = strBefore + _T( "%1" ) + strAfter ;
+            ret = strBefore + L"%1" + strAfter ;
 		}
 
 		return ret;
@@ -338,138 +338,138 @@ namespace DocFileFormat
 	}
 
 
-	std::wstring NumberingMapping::GetNumberFormatWideString(int nfc, bool bOlderVersion)
+	std::wstring NumberingMapping::GetNumberFormatWideString(int nfc, int nWordVersion)
 	{
-		if (bOlderVersion && nfc > 5)
+		if (nWordVersion > 0 && nfc > 5)
 		{
-			if (nfc == 0xff)	return std::wstring( _T( "bullet" ) );
-			else				return std::wstring( _T( "none" ) );
+            if (nfc == 0xff)	return std::wstring( L"bullet");
+            else				return std::wstring( L"none");
 		}
 		
 		switch ( nfc )
 		{
 		case 0:
-			return std::wstring( _T( "decimal" ) );
+            return std::wstring( L"decimal" );
 		case 1:
-			return std::wstring( _T( "upperRoman" ) );
+            return std::wstring( L"upperRoman" );
 		case 2:
-			return std::wstring( _T( "lowerRoman" ) );
+            return std::wstring( L"lowerRoman" );
 		case 3:
-			return std::wstring( _T( "upperLetter" ) );
+            return std::wstring( L"upperLetter");
 		case 4:
-			return std::wstring( _T( "lowerLetter" ) );
+            return std::wstring( L"lowerLetter");
 		case 5:
-			return std::wstring( _T( "ordinal" ) );
+            return std::wstring( L"ordinal" );
 		case 6:
-			return std::wstring( _T( "cardinalText" ) );
+            return std::wstring( L"cardinalText" );
 		case 7:
-			return std::wstring( _T( "ordinalText" ) );
+            return std::wstring( L"ordinalText" );
 		case 8:
-			return std::wstring( _T( "hex" ) );
+            return std::wstring( L"hex" );
 		case 9:
-			return std::wstring( _T( "chicago" ) );
+            return std::wstring( L"chicago" );
 		case 10:
-			return std::wstring( _T( "ideographDigital" ) );
+            return std::wstring( L"ideographDigital" );
 		case 11:
-			return std::wstring( _T( "japaneseCounting" ) );
+            return std::wstring( L"japaneseCounting" );
 		case 12:
-			return std::wstring( _T( "aiueo" ) );
+            return std::wstring( L"aiueo" );
 		case 13:
-			return std::wstring( _T( "iroha" ) );
+            return std::wstring( L"iroha" );
 		case 14:
-			return std::wstring( _T( "decimalFullWidth" ) );
+            return std::wstring( L"decimalFullWidth" );
 		case 15:
-			return std::wstring( _T( "decimalHalfWidth" ) );
+            return std::wstring( L"decimalHalfWidth" );
 		case 16:
-			return std::wstring( _T( "japaneseLegal" ) );
+            return std::wstring( L"japaneseLegal" );
 		case 17:
-			return std::wstring( _T( "japaneseDigitalTenThousand" ) );
+            return std::wstring( L"japaneseDigitalTenThousand" );
 		case 18:
-			return std::wstring( _T( "decimalEnclosedCircle" ) );
+            return std::wstring( L"decimalEnclosedCircle" );
 		case 19:
-			return std::wstring( _T( "decimalFullWidth2" ) );
+            return std::wstring( L"decimalFullWidth2" );
 		case 20:
-			return std::wstring( _T( "aiueoFullWidth" ) );
+            return std::wstring( L"aiueoFullWidth" );
 		case 21:
-			return std::wstring( _T( "irohaFullWidth" ) );
+            return std::wstring( L"irohaFullWidth" );
 		case 22:
-			return std::wstring( _T( "decimalZero" ) );
+            return std::wstring( L"decimalZero" );
 		case 23:
-			return std::wstring( _T( "bullet" ) );
+            return std::wstring( L"bullet" );
 		case 24:
-			return std::wstring( _T( "ganada" ) );
+            return std::wstring( L"ganada" );
 		case 25:
-			return std::wstring( _T( "chosung" ) );
+            return std::wstring( L"chosung" );
 		case 26:
-			return std::wstring( _T( "decimalEnclosedFullstop" ) );
+            return std::wstring( L"decimalEnclosedFullstop" );
 		case 27:
-			return std::wstring( _T( "decimalEnclosedParen" ) );
+            return std::wstring( L"decimalEnclosedParen" );
 		case 28:
-			return std::wstring( _T( "decimalEnclosedCircleChinese" ) );
+            return std::wstring( L"decimalEnclosedCircleChinese" );
 		case 29:
-			return std::wstring( _T( "ideographEnclosedCircle" ) );
+            return std::wstring( L"ideographEnclosedCircle" );
 		case 30:
-			return std::wstring( _T( "ideographTraditional" ) );
+            return std::wstring( L"ideographTraditional" );
 		case 31:
-			return std::wstring( _T( "ideographZodiac" ) );
+            return std::wstring( L"ideographZodiac" );
 		case 32:
-			return std::wstring( _T( "ideographZodiacTraditional" ) );
+            return std::wstring( L"ideographZodiacTraditional" );
 		case 33:
-			return std::wstring( _T( "taiwaneseCounting" ) );
+            return std::wstring( L"taiwaneseCounting" );
 		case 34:
-			return std::wstring( _T( "ideographLegalTraditional" ) );
+            return std::wstring( L"ideographLegalTraditional" );
 		case 35:
-			return std::wstring( _T( "taiwaneseCountingThousand" ) );
+            return std::wstring( L"taiwaneseCountingThousand" );
 		case 36:
-			return std::wstring( _T( "taiwaneseDigital" ) );
+            return std::wstring( L"taiwaneseDigital" );
 		case 37:
-			return std::wstring( _T( "chineseCounting" ) );
+            return std::wstring( L"chineseCounting" );
 		case 38:
-			return std::wstring( _T( "chineseLegalSimplified" ) );
+            return std::wstring( L"chineseLegalSimplified" );
 		case 39:
-			return std::wstring( _T( "chineseCountingThousand" ) );
+            return std::wstring( L"chineseCountingThousand" );
 		case 40:
-			return std::wstring( _T( "koreanDigital" ) );
+            return std::wstring( L"koreanDigital" );
 		case 41:
-			return std::wstring( _T( "koreanCounting" ) );
+            return std::wstring( L"koreanCounting" );
 		case 42:
-			return std::wstring( _T( "koreanLegal" ) );
+            return std::wstring( L"koreanLegal" );
 		case 43:
-			return std::wstring( _T( "koreanDigital2" ) );
+            return std::wstring( L"koreanDigital2" );
 		case 44:
-			return std::wstring( _T( "vietnameseCounting" ) );
+            return std::wstring( L"vietnameseCounting" );
 		case 45:
-			return std::wstring( _T( "russianLower" ) );
+            return std::wstring( L"russianLower" );
 		case 46:
-			return std::wstring( _T( "russianUpper" ) );
+            return std::wstring( L"russianUpper" );
 		case 47:
-			return std::wstring( _T( "none" ) );
+            return std::wstring( L"none" );
 		case 48:
-			return std::wstring( _T( "numberInDash" ) );
+            return std::wstring( L"numberInDash" );
 		case 49:
-			return std::wstring( _T( "hebrew1" ) );
+            return std::wstring( L"hebrew1" );
 		case 50:
-			return std::wstring( _T( "hebrew2" ) );
+            return std::wstring( L"hebrew2" );
 		case 51:
-			return std::wstring( _T( "arabicAlpha" ) );
+            return std::wstring( L"arabicAlpha" );
 		case 52:
-			return std::wstring( _T( "arabicAbjad" ) );
+            return std::wstring( L"arabicAbjad" );
 		case 53:
-			return std::wstring( _T( "hindiVowels" ) );
+            return std::wstring( L"hindiVowels" );
 		case 54:
-			return std::wstring( _T( "hindiConsonants" ) );
+            return std::wstring( L"hindiConsonants" );
 		case 55:
-			return std::wstring( _T( "hindiNumbers" ) );
+            return std::wstring( L"hindiNumbers" );
 		case 56:
-			return std::wstring( _T( "hindiCounting" ) );
+            return std::wstring( L"hindiCounting" );
 		case 57:
-			return std::wstring( _T( "thaiLetters" ) );
+            return std::wstring( L"thaiLetters" );
 		case 58:
-			return std::wstring( _T( "thaiNumbers" ) );
+            return std::wstring( L"thaiNumbers" );
 		case 59:
-			return std::wstring( _T( "thaiCounting" ) );
+            return std::wstring( L"thaiCounting" );
 		default:
-			return std::wstring( _T( "decimal" ) );
+            return std::wstring( L"decimal" );
 		}
 	}
 
@@ -486,22 +486,22 @@ namespace DocFileFormat
 		}
 
 //--------------------------------------------------------------------------------
-		m_pXmlWriter->WriteNodeBegin( _T( "w:lvl" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString(level).c_str());
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+        m_pXmlWriter->WriteNodeBegin( L"w:lvl", TRUE );
+            m_pXmlWriter->WriteAttribute( L"w:ilvl", FormatUtils::IntToWideString(level));
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
-		m_pXmlWriter->WriteNodeBegin( _T( "w:start" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString(lvl.iStartAt).c_str());
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"w:start", TRUE );
+            m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString(lvl.iStartAt));
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
-		m_pXmlWriter->WriteNodeBegin( _T( "w:numFmt" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), GetNumberFormatWideString(lvl.nfc, true).c_str());
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"w:numFmt", TRUE );
+            m_pXmlWriter->WriteAttribute( L"w:val", GetNumberFormatWideString(lvl.nfc, true));
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 //// suffix
-//		m_pXmlWriter->WriteNodeBegin( _T( "w:suff" ), TRUE );
-//		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl.ixchFollow, &FollowingCharMap[0][0], 3, 8).c_str());
-//		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+//		m_pXmlWriter->WriteNodeBegin( L"w:suff", TRUE );
+//		m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl.ixchFollow, &FollowingCharMap[0][0], 3, 8));
+//		m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 // Number level text
 		std::wstring lvlText = GetLvlText(lvl, isSymbol, lvl.cbTextBefore, lvl.cbTextAfter);
@@ -515,33 +515,33 @@ namespace DocFileFormat
 		//}
 		if (!lvlText.empty())
 		{
-			m_pXmlWriter->WriteNodeBegin(_T("w:lvlText"), TRUE);
-				m_pXmlWriter->WriteAttribute(_T("w:val"), lvlText.c_str());
-			m_pXmlWriter->WriteNodeEnd(_T( ""), TRUE);
+            m_pXmlWriter->WriteNodeBegin(L"w:lvlText",TRUE);
+                m_pXmlWriter->WriteAttribute(L"w:val",lvlText);
+            m_pXmlWriter->WriteNodeEnd(L"", TRUE);
 		}
 
 // jc
-		m_pXmlWriter->WriteNodeBegin( _T( "w:lvlJc" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl.jc, &LevelJustificationMap[0][0], 3, 7).c_str());
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"w:lvlJc", TRUE );
+            m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl.jc, &LevelJustificationMap[0][0], 3, 7));
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 // pPr
-		m_pXmlWriter->WriteNodeBegin( _T( "w:pPr" ), FALSE );
-		m_pXmlWriter->WriteNodeEnd(_T("w:pPr"));
+        m_pXmlWriter->WriteNodeBegin( L"w:pPr", FALSE );
+        m_pXmlWriter->WriteNodeEnd(L"w:pPr");
 
 //  rPr
-		m_pXmlWriter->WriteNodeBegin( _T( "w:rPr" ), FALSE );
+        m_pXmlWriter->WriteNodeBegin( L"w:rPr", FALSE );
 
 		if (!fontFamily.empty())
 		{
-			m_pXmlWriter->WriteNodeBegin( _T( "w:rFonts" ), TRUE );
+            m_pXmlWriter->WriteNodeBegin( L"w:rFonts", TRUE );
 				// w:hint="default"
-				m_pXmlWriter->WriteAttribute(_T("w:hAnsi"), fontFamily.c_str());
-				m_pXmlWriter->WriteAttribute(_T("w:ascii"), fontFamily.c_str());
-			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+                m_pXmlWriter->WriteAttribute(L"w:hAnsi",fontFamily);
+                m_pXmlWriter->WriteAttribute(L"w:ascii",fontFamily);
+            m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 		}
-		m_pXmlWriter->WriteNodeEnd(_T("w:rPr"));
+        m_pXmlWriter->WriteNodeEnd(L"w:rPr");
 		
-		m_pXmlWriter->WriteNodeEnd(_T("w:lvl"));
+        m_pXmlWriter->WriteNodeEnd(L"w:lvl");
 	}
 
 	void NumberingMapping::LevelMapping(const ListLevel* lvl, unsigned int level, short styleIndex)
@@ -556,58 +556,58 @@ namespace DocFileFormat
 
 // Проверяем шрифт
 
-		m_pXmlWriter->WriteNodeBegin( _T( "w:lvl" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString(level).c_str());
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+        m_pXmlWriter->WriteNodeBegin( L"w:lvl", TRUE );
+        m_pXmlWriter->WriteAttribute( L"w:ilvl", FormatUtils::IntToWideString(level));
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 // starts at
 
-		m_pXmlWriter->WriteNodeBegin( _T( "w:start" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString(lvl->iStartAt).c_str());
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"w:start", TRUE );
+        m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString(lvl->iStartAt));
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 // number format
 
-		m_pXmlWriter->WriteNodeBegin( _T( "w:numFmt" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:val" ), GetNumberFormatWideString(lvl->nfc).c_str());
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"w:numFmt", TRUE );
+        m_pXmlWriter->WriteAttribute( L"w:val", GetNumberFormatWideString(lvl->nfc));
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 // suffix
 
-		m_pXmlWriter->WriteNodeBegin( _T( "w:suff" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl->ixchFollow, &FollowingCharMap[0][0], 3, 8).c_str());
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"w:suff", TRUE );
+        m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl->ixchFollow, &FollowingCharMap[0][0], 3, 8));
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
 // style
 // The style id is used for a reverse reference. 
 // It can happen that the reference points to the wrong style.
 
-		if (styleIndex != ListData::ISTD_NIL)
+		if (styleIndex != ListData::ISTD_NIL && styleIndex < m_document->Styles->Styles->size())
 		{
-			m_pXmlWriter->WriteNodeBegin( _T( "w:pStyle" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId(m_document->Styles->Styles->at(styleIndex))).c_str());
-			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+            m_pXmlWriter->WriteNodeBegin( L"w:pStyle", TRUE );
+            m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId(m_document->Styles->Styles->at(styleIndex))));
+            m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 		}
 
 // Number level text
 
-		m_pXmlWriter->WriteNodeBegin(_T("w:lvlText"), TRUE);
-		m_pXmlWriter->WriteAttribute(_T("w:val"), GetLvlText(lvl, cpMapping.CheckIsSymbolFont()).c_str());
-		m_pXmlWriter->WriteNodeEnd(_T( ""), TRUE);
+        m_pXmlWriter->WriteNodeBegin(L"w:lvlText",TRUE);
+        m_pXmlWriter->WriteAttribute(L"w:val",GetLvlText(lvl, cpMapping.CheckIsSymbolFont()));
+        m_pXmlWriter->WriteNodeEnd(L"",TRUE);
 
 		WriteLevelPictureBullet(lvl->grpprlChpx);
 
 // legacy
 		if (lvl->fWord6)
 		{
-			m_pXmlWriter->WriteNodeBegin( _T( "w:legacy" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:legacy" ), _T( "1" ) );
-			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+            m_pXmlWriter->WriteNodeBegin( L"w:legacy", TRUE );
+            m_pXmlWriter->WriteAttribute( L"w:legacy", L"1" );
+            m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 		}
 // jc
-		m_pXmlWriter->WriteNodeBegin( _T( "w:lvlJc" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl->jc, &LevelJustificationMap[0][0], 3, 7).c_str());
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"w:lvlJc", TRUE );
+        m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl->jc, &LevelJustificationMap[0][0], 3, 7));
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 // pPr
 		bool isBidi = false;
 		ParagraphPropertiesMapping oppMapping(m_pXmlWriter, m_context, m_document, NULL, isBidi);
@@ -617,7 +617,7 @@ namespace DocFileFormat
 
 		m_pXmlWriter->WriteString(oWriterTemp.GetXmlString());
 
-		m_pXmlWriter->WriteNodeEnd(_T("w:lvl"));
+        m_pXmlWriter->WriteNodeEnd(L"w:lvl");
 	}
 
 	void NumberingMapping::PictureBulletsMapping()
@@ -633,14 +633,14 @@ namespace DocFileFormat
 
 			if ((chpxs != NULL) && (!chpxs->empty()))
 			{
-				PictureDescriptor pict(chpxs->front(), m_document->DataStream, fcEnd - fc, m_document->FIB->m_bOlderVersion);
+				PictureDescriptor pict(chpxs->front(), m_document->DataStream, fcEnd - fc, m_document->nWordVersion);
 
 				if ((pict.mfp.mm > 98) && (pict.shapeContainer != NULL))
 				{
-					m_pXmlWriter->WriteNodeBegin( _T( "w:numPicBullet" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:numPicBulletId" ), FormatUtils::IntToWideString( iter->first ).c_str() );
-					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
-					m_pXmlWriter->WriteNodeBegin( _T( "w:pict" ) );
+                    m_pXmlWriter->WriteNodeBegin( L"w:numPicBullet", TRUE );
+                    m_pXmlWriter->WriteAttribute( L"w:numPicBulletId", FormatUtils::IntToWideString( iter->first ));
+                    m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+                    m_pXmlWriter->WriteNodeBegin( L"w:pict" );
 
 					//inline picture + bullete props
 					if (pict.blipStoreEntry != NULL)
@@ -657,8 +657,8 @@ namespace DocFileFormat
 						pict.shapeContainer->Convert(&oShape);
 					}
 
-					m_pXmlWriter->WriteNodeEnd(_T("w:pict"));
-					m_pXmlWriter->WriteNodeEnd(_T("w:numPicBullet"));
+                    m_pXmlWriter->WriteNodeEnd(L"w:pict");
+                    m_pXmlWriter->WriteNodeEnd(L"w:numPicBullet");
 				}  
 			}
 
@@ -670,7 +670,7 @@ namespace DocFileFormat
 	{
 		if (grpprlChpx)
 		{
-			unsigned int cp = 0;
+			unsigned int index = 0;
 			bool isPictureBullet = false;
 
 			for (std::list<SinglePropertyModifier>::const_iterator iter = grpprlChpx->grpprl->begin(); iter != grpprlChpx->grpprl->end(); ++iter)
@@ -679,7 +679,7 @@ namespace DocFileFormat
 				{
 					case sprmCPbiIBullet:
 					{
-						cp = FormatUtils::BytesToUInt32(iter->Arguments, 0, iter->argumentsSize);
+						index = FormatUtils::BytesToUInt32(iter->Arguments, 0, iter->argumentsSize);
 					}break;
 
 					case sprmCPbiGrf:
@@ -691,10 +691,10 @@ namespace DocFileFormat
 
 			if (isPictureBullet)
 			{
-				m_pXmlWriter->WriteNodeBegin(_T("w:lvlPicBulletId"), TRUE);
-				m_pXmlWriter->WriteAttribute(_T("w:val"), FormatUtils::IntToWideString(cp).c_str());
-				m_pXmlWriter->WriteNodeEnd(_T(""), TRUE);  
+                m_pXmlWriter->WriteNodeBegin(L"w:lvlPicBulletId",TRUE);
+                m_pXmlWriter->WriteAttribute(L"w:val",FormatUtils::IntToWideString(index));
+                m_pXmlWriter->WriteNodeEnd(L"",TRUE);
 			}
 		}
 	}
-}
+}

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -52,9 +52,9 @@ namespace DocFileFormat
 
 	static const wchar_t LevelJustificationMap[3][7] =
 	{
-		_T("left"),
-		_T("center"),
-		_T("right")
+        L"left",
+        L"center",
+        L"right"
 	};
 
 	class NumberingMapping: public AbstractOpenXmlMapping, public IMapping
@@ -65,7 +65,7 @@ namespace DocFileFormat
 		
 		static int FindIndexbyId(const std::list<ListData*>& listData, int id);
 		/// Converts the number format code of the binary format.
-		static std::wstring GetNumberFormatWideString(int nfc, bool bOlderVersion = false);
+		static std::wstring GetNumberFormatWideString(int nfc, int nWordVersion = 0);
 		
 		virtual ~NumberingMapping();
 
@@ -89,4 +89,4 @@ namespace DocFileFormat
 		WordDocument*			m_document;
 		WordprocessingDocument*	m_xmldocument;	
 	};
-}
+}

ASCOfficeDocFile/DocDocxConverter/OfficeArtContent.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,6 +34,7 @@
 #include "OfficeDrawing/RecordFactory.h"
 
 #include "OfficeDrawing/DrawingContainer.h"
+#include "OfficeDrawing/DrawingRecord.h"
 #include "OfficeDrawing/DrawingGroup.h"
 #include "OfficeDrawing/GroupContainer.h"
 #include "OfficeDrawing/Shape.h"
@@ -57,9 +58,9 @@ namespace DocFileFormat
 
 	public:
 
-		OfficeArtContent (const FileInformationBlock* pFIB, POLE::Stream* pStream): m_pDrawingGroupData(NULL)
+		OfficeArtContent (const FileInformationBlock* pFIB, POLE::Stream* pStream): m_pDrawingGroupData(NULL), m_pBackgroud(NULL)
 		{
-			VirtualStreamReader oStearmReader(pStream, 0 , pFIB->m_bOlderVersion);
+			VirtualStreamReader oStearmReader(pStream, 0 , pFIB->m_nWordVersion);
 
 			if (pFIB->m_FibWord97.fcDggInfo > oStearmReader.GetSize()) return;
 
@@ -87,15 +88,23 @@ namespace DocFileFormat
 							{
 								// the child is a subgroup
 								GroupContainer* group	=	static_cast<GroupContainer*>(groupChild);
-								group->Index			=	i;
-								drawing.container->Children[i] = group;
+								if (group)
+								{
+									group->Index =	i;
+								}
 							}
 							else if (ShapeContainer::TYPE_CODE_0xF004 == groupChild->TypeCode)
 							{
 								// the child is a shape
 								ShapeContainer* shape	=	static_cast<ShapeContainer*>(groupChild);
-								shape->Index			=	i;
-								drawing.container->Children[i] = shape;
+								if (shape)
+								{
+									shape->Index = i;
+									if (shape->isBackground())
+									{
+										m_pBackgroud = shape;
+									}
+								}
 							}
 						}
 					}
@@ -112,7 +121,10 @@ namespace DocFileFormat
 			for ( std::list<OfficeArtWordDrawing>::iterator iter = m_arrDrawings.begin(); iter != m_arrDrawings.end(); ++iter)
 				RELEASEOBJECT(iter->container);  
 		}
-
+		inline ShapeContainer* GetShapeBackgound()
+		{
+			return m_pBackgroud;
+		}
 		inline ShapeContainer* GetShapeContainer (int spid)
 		{
 			ShapeContainer* ret = NULL;
@@ -138,7 +150,6 @@ namespace DocFileFormat
 							if (shape->GetShapeID() == spid)
 							{
 								ret = container;
-
 								break;
 							}
 						}
@@ -150,7 +161,7 @@ namespace DocFileFormat
 
 							if (shape->GetShapeID() == spid)
 							{
-								ret						=	container;
+								ret	 =	container;
 								break;
 							}
 						}
@@ -174,7 +185,7 @@ namespace DocFileFormat
 		}
 
 	private:
-
+		ShapeContainer*					m_pBackgroud;
 		DrawingGroup*					m_pDrawingGroupData;
 		std::list<OfficeArtWordDrawing>	m_arrDrawings;
 	};

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BitmapBlip.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreContainer.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreEntry.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -110,6 +110,11 @@ namespace DocFileFormat
 			unused2		=	Reader->ReadByte();
 			unused3		=	Reader->ReadByte();
 
+			if (btMacOS != btWin32)
+			{
+				btWin32 = btMacOS = (Global::BlipType)this->Instance;
+			}
+
 			if (BodySize > 0x24)
 			{
 				Blip	=	RecordFactory::ReadRecord(Reader, 0);

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ChildAnchor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -60,7 +60,7 @@ namespace DocFileFormat
 			_size.cx	=	Right - Left;
 			_size.cy	=	Bottom - Top;
 
-			rcgBounds	=	DocFormatUtils::Rectangle (_point, _size);
+			rcgBounds	=	DocFileFormat::Rectangle (_point, _size);
 		}
 
 		virtual ~ChildAnchor()
@@ -75,7 +75,7 @@ namespace DocFileFormat
 	public:
 
 		/// Rectangle that describes the bounds of the anchor
-		DocFormatUtils::Rectangle rcgBounds;
+		DocFileFormat::Rectangle rcgBounds;
 		int Left;
 		int Top;
 		int Right;

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientAnchor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientData.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DiagramBooleanProperties.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingContainer.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingGroup.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)