XlsxFormat - read/write iconSet ext

Add support of a GM_COMPATIBLE mode for a text. Also fixed the problem with clipping by the path with specified a world-transform

.gitignore

@@ -3,6 +3,8 @@ dictionaries/
 LicenceManager/
 Common/boost_1_58_0
 Common/3dParty/boost/boost_1_58_0
+Common/3dParty/boost/ios
+Common/3dParty/boost/osx
 Common/3dParty/icu/win_64
 Common/3dParty/icu/win_32
 Common/3dParty/icu/linux_64
@@ -18,6 +20,9 @@ Common/3dParty/curl/win_32
 Common/3dParty/curl/linux_64
 Common/3dParty/curl/linux_32
 Common/3dParty/curl/mac_64
+Common/3dParty/v8/.cipd
+Common/3dParty/v8/.gclient
+Common/3dParty/v8/.gclient_entries
 Common/3dParty/v8/v8
 Common/3dParty/v8/depot_tools
 Common/3dParty/v8/win_64
@@ -47,6 +52,8 @@ ASCOfficeXlsFile2/win32/_ASCOfficeXlsFile2_p.c
 ASCOfficeXlsFile2/win32/dlldata.c
 OfficeUtils/win32/OfficeUtilsLib/OfficeUtilsLib/ReadMe.txt
 X2tConverter/**/Makefile.*
+X2tConverter/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/Makefile
+X2tConverter/Common/DocxFormat/DocxFormatLib/Makefile
 *.7z
 *.obj
 *.pdb

ASCOfficeDocFile/Common/Aggregat.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/Common/Callback.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/Common/FormatUtils.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -52,8 +52,10 @@
     #include <string.h>
 #endif
 
+#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 #include "../../DesktopEditor/common/Types.h"
 #include "../../Common/DocxFormat/Source/Base/unicode_util.h"
+#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 #include "../../UnicodeConverter/UnicodeConverter.h"
 
 #include <boost/format.hpp>

ASCOfficeDocFile/Common/IOperand.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/Common/IVirtualConstructor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/Common/LanguageCodes.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/Common/SPRMCodes.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/Common/Singleton.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/Common/TargetOptions.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/Common/TextMark.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/Common/XmlTools.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/Common/utf8.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/AbstractOpenXmlMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/AnnotationOwnerList.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -58,7 +58,8 @@ namespace DocFileFormat
 		}
 		else
 		{
-			short cch = reader->ReadInt16();
+			short cch = reader->ReadInt16(); 
+
 
 			unsigned char *chars = reader->ReadBytes(18, true);
 
@@ -67,13 +68,34 @@ namespace DocFileFormat
 			newObject->m_AuthorIndex = reader->ReadUInt16();
 
 			//skip 4 bytes
-			reader->ReadBytes(4, false);
+			unsigned int skip = reader->ReadUInt32();
 
-			newObject->m_BookmarkId = reader->ReadInt32();
+			newObject->m_BookmarkId = reader->ReadInt32(); //-1 - comment is on a length zero text range in the Main Document
 			RELEASEARRAYOBJECTS(chars);
 		}
 
 
+		return static_cast<ByteStructure*>(newObject);
+	}
+	ByteStructure* AnnotationReferenceExDescriptor::ConstructObject(VirtualStreamReader* reader, int length)
+	{
+		AnnotationReferenceExDescriptor *newObject = new AnnotationReferenceExDescriptor();
+
+		if (reader->nWordVersion > 0)
+		{
+
+		}
+		else
+		{
+			m_nDTTM					= reader->ReadUInt32(); 
+			reader->ReadUInt16(); //padding1
+			m_nDepth				= reader->ReadUInt32(); 
+			m_nDiatrdParent			= reader->ReadUInt32(); 
+			unsigned int flag		= reader->ReadUInt32(); 
+			m_fInkAtn = GETBIT(flag, 1);
+		}
+
+
 		return static_cast<ByteStructure*>(newObject);
 	}
 }

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -46,21 +46,6 @@ namespace DocFileFormat
 			return (nWordVersion > 0) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
 		}
 
-		inline std::wstring GetUserInitials() const
-		{
-			return m_UserInitials;
-		}
-
-		inline unsigned short GetAuthorIndex() const
-		{
-			return m_AuthorIndex;
-		}
-
-		inline int GetBookmarkId() const
-		{
-			return m_BookmarkId;
-		}
-
         AnnotationReferenceDescriptor() : m_AuthorIndex(0), m_BookmarkId(0)
 		{
 		}
@@ -71,13 +56,35 @@ namespace DocFileFormat
 
         virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
 
-	private:
-
-		/// The initials of the user who left the annotation.
 		std::wstring	m_UserInitials;
-		/// An index into the string table of comment author names.
 		unsigned short	m_AuthorIndex;
-		/// Identifies a bookmark.
 		int				m_BookmarkId;
 	};
+
+	class AnnotationReferenceExDescriptor: public ByteStructure
+	{
+	public:
+		static const int STRUCTURE_SIZE = 18;
+		static const int STRUCTURE_SIZE_OLD = 0;
+
+		static const int GetSize(int nWordVersion)
+		{
+			return (nWordVersion > 0) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
+		}
+
+        AnnotationReferenceExDescriptor() : m_nDTTM(0), m_nDepth(0), m_nDiatrdParent(0), m_fInkAtn(false)
+		{
+		}
+
+		virtual ~AnnotationReferenceExDescriptor() 
+		{
+		}
+
+        virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
+
+		unsigned int	m_nDTTM;
+		unsigned int	m_nDepth;
+		unsigned int	m_nDiatrdParent;
+		bool			m_fInkAtn;
+	};
 }

ASCOfficeDocFile/DocDocxConverter/AutoSummaryInfo.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/BookmarkFirst.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -39,13 +39,8 @@ namespace DocFileFormat
   class BookmarkFirst: public ByteStructure
   {
     private:
-      /// An unsigned integer that specifies a zero-based index into the PlcfBkl or PlcfBkld 
-      /// that is paired with the PlcfBkf  or PlcfBkfd containing this FBKF.
-      /// The entry found at said index specifies the location of the end of the bookmark associated with this FBKF.
-      /// Ibkl MUST be unique for all FBKFs inside a given PlcfBkf or PlcfBkfd.
-      short ibkl;
-      /// A BKC that specifies further information about the bookmark associated with this FBKF.
-      short bkc;
+		short ibkl;
+		short bkc;
 
     public:
       static const int STRUCTURE_SIZE = 4;
@@ -78,4 +73,32 @@ namespace DocFileFormat
 	    return static_cast<ByteStructure*>( newObject );
       }
   };
+  class AtnBookmarkFirst: public ByteStructure
+  {
+public:
+	unsigned short	bmc;
+	unsigned int	lTag;
+
+	static const int STRUCTURE_SIZE = 10;
+
+	  AtnBookmarkFirst()
+	  {
+	  }
+
+	  virtual ~AtnBookmarkFirst()
+	  {
+	  }
+
+      virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length )
+      {
+        AtnBookmarkFirst *newObject = new AtnBookmarkFirst();
+
+	    newObject->bmc = reader->ReadUInt16(); //0x0100
+        newObject->lTag = reader->ReadUInt32();
+        
+		unsigned int lTagOld = reader->ReadUInt32();
+
+	    return static_cast<ByteStructure*>( newObject );
+      }
+  };
 }

ASCOfficeDocFile/DocDocxConverter/BorderCode.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/ByteStructure.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -75,7 +75,7 @@ namespace DocFileFormat
 		convertSprms( dynamic_cast<CharacterPropertyExceptions*>( chpx )->grpprl, _rPr );
 
 		// apend revision changes
-		if (_revisionData->Type == Changed)
+		if ((_revisionData) && (_revisionData->Type == Changed))
 		{
             XMLTools::XMLElement rPrChange( L"w:rPrChange");
 

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/CharacterPropertyExceptions.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/CharacterRange.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -52,8 +52,6 @@ namespace DocFileFormat
 			{
 				m_context->_docx->RegisterComments();
 
-				int index = 0; 
-
                 m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
                 m_pXmlWriter->WriteNodeBegin( L"w:comments", TRUE );
 
@@ -63,33 +61,60 @@ namespace DocFileFormat
                 m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
                 m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
                 m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wpc", L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" ); 
+                m_pXmlWriter->WriteAttribute( L"xmlns:cx", L"http://schemas.microsoft.com/office/drawing/2014/chartex"  );
+                m_pXmlWriter->WriteAttribute( L"xmlns:cx1", L"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex"  );
+                m_pXmlWriter->WriteAttribute( L"xmlns:mc", L"http://schemas.openxmlformats.org/markup-compatibility/2006" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:m", L"http://schemas.openxmlformats.org/officeDocument/2006/math" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wp14", L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:w14", L"http://schemas.microsoft.com/office/word/2010/wordml" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:w15", L"http://schemas.microsoft.com/office/word/2012/wordml" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:w16se", L"http://schemas.microsoft.com/office/word/2015/wordml/symex" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wpg", L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wpi", L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wne", L"http://schemas.microsoft.com/office/word/2006/wordml" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wps", L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape" );
+                m_pXmlWriter->WriteAttribute( L"mc:Ignorable", L"w14 w15 w16se wp14");
+
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				int cp = m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr;
 
 				size_t count = m_document->AnnotationsReferencePlex->Elements.size();
-				for (size_t i = 0; i < count; ++i)
+				for (size_t index = 0; index < count; ++index)
 				{   
 					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
+					AnnotationReferenceExDescriptor* atrdPost10 = m_document->AnnotationsReferenceExPlex ? static_cast<AnnotationReferenceExDescriptor*>(m_document->AnnotationsReferenceExPlex->Elements[index]) : NULL;
 
-					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
+					if (atrdPre10->m_BookmarkId < 0)
+					{
+						m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 + count + 1024 ));
+					}
+					else
+					{
+						m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 ));
+					}
+					if (atrdPost10)
+					{
+						//!!!TODO!!!
+						/*//ATRDpost10 is optional and not saved in all files
+						if (doc.AnnotationReferenceExtraTable != null && 
+						doc.AnnotationReferenceExtraTable.Count > index)
+						{
+						AnnotationReferenceDescriptorExtra atrdPost10 = doc.AnnotationReferenceExtraTable[index];
+						atrdPost10.Date.Convert(new DateMapping(_writer));
+						}*/	
+					}
+					if (atrdPre10->m_AuthorIndex < m_document->AnnotationOwners->size())	//conv_253l2H1CehgKwsxCtNk__docx.doc
 					{
 						m_pXmlWriter->WriteAttribute( L"w:author",
-							FormatUtils::XmlEncode(m_document->AnnotationOwners->at( index_author ) ));
+							FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->m_AuthorIndex ) ));
 					}
-                    m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->GetUserInitials());
+                    m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->m_UserInitials);
+
 
-					//!!!TODO!!!
-					/*//ATRDpost10 is optional and not saved in all files
-					if (doc.AnnotationReferenceExtraTable != null && 
-					doc.AnnotationReferenceExtraTable.Count > index)
-					{
-					AnnotationReferenceDescriptorExtra atrdPost10 = doc.AnnotationReferenceExtraTable[index];
-					atrdPost10.Date.Convert(new DateMapping(_writer));
-					}*/
 
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
@@ -116,8 +141,6 @@ namespace DocFileFormat
 					}
 
                     m_pXmlWriter->WriteNodeEnd(L"w:comment" );
-
-					++index;
 				}
 
                 m_pXmlWriter->WriteNodeEnd( L"w:comments" );

ASCOfficeDocFile/DocDocxConverter/ContentTypes.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/ConversionContext.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -61,7 +61,7 @@ namespace DocFileFormat
 
 namespace DocFileFormat
 {
-	long Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
+	_UINT32 Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
 	{
 		if (!doc || !docx) return S_FALSE;
 		
@@ -202,20 +202,18 @@ namespace DocFileFormat
 		return S_OK;
 	}
 
-	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
+	_UINT32 Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
 	{
-        long result = S_FALSE;
-
 		WordDocument			doc(progress, m_sTempFolder);
 		WordprocessingDocument	docx(strDstDirectory, &doc);
 		
-		result = doc.LoadDocument(strSrcFile, password);
+		_UINT32 result = doc.LoadDocument(strSrcFile, password);
 
-        if (result == S_OK)
+        if (result == 0)
 		{
 			result = Convert(&doc, &docx, progress);
 
-            if (result == S_OK)
+            if (result == 0)
 			{
 				docx.SaveDocument(bMacros);
 

ASCOfficeDocFile/DocDocxConverter/Converter.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -32,6 +32,7 @@
 #pragma once
 
 #include <string>
+#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 
 struct ProgressCallback;
 
@@ -48,9 +49,9 @@ namespace DocFileFormat
 
 		std::wstring m_sTempFolder;
 
-		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
+		_UINT32 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);	
+		_UINT32 Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	
 	};
 }

ASCOfficeDocFile/DocDocxConverter/DateAndTime.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

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

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -85,21 +85,17 @@ namespace DocFileFormat
 		int getCurrentSection	(int cp);
 //---------------------------------
 		bool isSectionEnd		( int cp );
-	// Writes a Paragraph that starts at the given cp and 
-	// ends at the next paragraph end mark or section end mark
+
 		int writeParagraph( int cp, int cpEnd ); 
-	// Writes a Paragraph that starts at the given cpStart and 
-	// ends at the given cpEnd
 		int writeParagraph( int initialCp, int cpEnd, bool sectionEnd, bool lastBad = false );
-	// Writes a Paragraph RSID
-		void writeParagraphRsid( const ParagraphPropertyExceptions* papx );
-	// Writes a run with the given characters and CHPX
 		int writeRun( std::vector<wchar_t>* chars, CharacterPropertyExceptions* chpx, int initialCp );
-	// Writes the given text to the document	
-		int	 writeText			( std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText );
+		int	writeText			( std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText );
+		void writeParagraphRsid	( const ParagraphPropertyExceptions* papx );
 		void writeTextElement	( const std::wstring& text, const std::wstring& textType );
         void writeTextStart		( const std::wstring& textType, bool preserve_space);
 		void writeTextEnd		( const std::wstring& textType );
+		void writeField			(const std::wstring& sFieldString, int cpFieldStart, int cpFieldEnd);
+
 		
 		std::vector<int> searchBookmarks( std::vector<wchar_t>* chars, int initialCp );
 		std::vector<int> searchAnnot(std::vector<wchar_t>* chars, int initialCp);

ASCOfficeDocFile/DocDocxConverter/DocumentProperties.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/DocumentProperties.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/DocumentTypographyInfo.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/DrawingObjectGrid.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/EmuValue.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/EndnoteDescriptor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -37,21 +37,14 @@ namespace DocFileFormat
 {
   class EndnoteDescriptor: public ByteStructure
   {
-    private:
-	  short aEndIdx;
-
     public:
       static const int STRUCTURE_SIZE = 2;
 
-	  EndnoteDescriptor():
-      aEndIdx(0)
-	  {
-	  }
+	  EndnoteDescriptor(): aEndIdx(0) {}
 
 	  virtual ~EndnoteDescriptor()
 	  {
-	  }
-  
+	  }  
       virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length )
       {
         EndnoteDescriptor *newObject = new EndnoteDescriptor();
@@ -60,5 +53,7 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>( newObject );
       }
+
+	  short aEndIdx;
   };
 }

ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FieldCharacter.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FileInformationBlock.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -110,7 +110,7 @@ namespace DocFileFormat
 	typedef struct FibWord2
 	{
 		unsigned int Spare  = 0;
-		unsigned char rgwSpare0[3];
+		unsigned short rgwSpare0[3];
 
 		unsigned int fcPlcMcr = 0;
 		unsigned int lcbPlcMcr = 0;
@@ -560,8 +560,7 @@ namespace DocFileFormat
 					m_FibWord97.fcPlcffndRef	= reader.ReadInt32();
 					m_FibWord97.lcbPlcffndRef	= reader.ReadInt32();	
 
-					m_FibWord97.lcbPlcfandTxt	= reader.ReadInt32();//112
-
+					m_FibWord97.fcPlcffndTxt	= reader.ReadInt32();//112
 					m_FibWord97.lcbPlcffndTxt	= reader.ReadInt32();
 
 					m_FibWord97.fcPlcfandRef	= reader.ReadInt32();
@@ -1313,10 +1312,10 @@ namespace DocFileFormat
 			
 			flag16 = reader.ReadUInt16(); //10
 			
-			m_FibBase.fDot				= (flag16 & 0x0001) >> 2;
-			m_FibBase.fGlsy				= (flag16 & 0x0002) >> 1;
-			m_FibBase.fComplex			= (flag16 & 0x0004) >> 2;
-            m_FibBase.fHasPic			= (flag16 & 0x0008) >> 3;
+			m_FibBase.fDot				= ((flag16 & 0x0001) >> 2) != 0;
+			m_FibBase.fGlsy				= ((flag16 & 0x0002) >> 1) != 0;
+			m_FibBase.fComplex			= ((flag16 & 0x0004) >> 2) != 0;
+            m_FibBase.fHasPic			= ((flag16 & 0x0008) >> 3) != 0;
             m_FibBase.cQuickSaves		= (WORD)(((int)flag16 & 0x00F0) >> 4);
             m_FibBase.fEncrypted		= FormatUtils::BitmaskToBool((int)flag16, 0x0100);
 			m_FibBase.fWhichTblStm		= FormatUtils::BitmaskToBool((int)flag16, 0x0200);

ASCOfficeDocFile/DocDocxConverter/FixedPointNumber.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FontFamilyName.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FontFamilyName.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FooterMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FootnoteDescriptor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -37,21 +37,15 @@ namespace DocFileFormat
 {
   class FootnoteDescriptor: public ByteStructure
   {
-    private:
-	  short aFtnIdx;
 
     public:
 	  static const int STRUCTURE_SIZE = 2;
 
-	  FootnoteDescriptor():
-      aFtnIdx(0)
-	  {
-	  }
+	  FootnoteDescriptor() : aFtnIdx(0)  {}
 
 	  virtual ~FootnoteDescriptor()
 	  {
-	  }
-  
+	  }  
       virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length )
       {
         FootnoteDescriptor *newObject = new FootnoteDescriptor();
@@ -60,5 +54,7 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>( newObject );
       }
+
+	  short aFtnIdx;
   };
 }

ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -63,7 +63,35 @@ namespace DocFileFormat
                 m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
                 m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
                 m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
+				m_pXmlWriter->WriteAttribute( L"xmlns:wpc", L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" );
+				m_pXmlWriter->WriteAttribute( L"xmlns:mc", L"http://schemas.openxmlformats.org/markup-compatibility/2006");
+				m_pXmlWriter->WriteAttribute( L"xmlns:wp14", L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing");
+				m_pXmlWriter->WriteAttribute( L"xmlns:wp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
+				m_pXmlWriter->WriteAttribute( L"xmlns:w14", L"http://schemas.microsoft.com/office/word/2010/wordml" );
+				m_pXmlWriter->WriteAttribute( L"xmlns:wpg", L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" );
+				m_pXmlWriter->WriteAttribute( L"xmlns:wpi", L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk" );
+				m_pXmlWriter->WriteAttribute( L"xmlns:wne", L"http://schemas.microsoft.com/office/word/2006/wordml" );
+				m_pXmlWriter->WriteAttribute( L"xmlns:wps", L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape" );
+				m_pXmlWriter->WriteAttribute( L"xmlns:a", L"http://schemas.openxmlformats.org/drawingml/2006/main" );
+				m_pXmlWriter->WriteAttribute( L"xmlns:m", L"http://schemas.openxmlformats.org/officeDocument/2006/math" );
+				m_pXmlWriter->WriteAttribute( L"mc:Ignorable", L"w14 wp14" );
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+                
+				//m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE );
+				//m_pXmlWriter->WriteAttribute( L"w:type", L"separator");
+				//m_pXmlWriter->WriteAttribute( L"w:id", L"-1");
+				//m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+
+				//m_pXmlWriter->WriteString(L"<w:p><w:pPr><w:spacing w:lineRule=\"auto\" w:line=\"240\" w:after=\"0\"/></w:pPr><w:r></w:r><w:r><w:separator/></w:r></w:p>");
+				//m_pXmlWriter->WriteNodeEnd( L"w:footnote");
+
+				//m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE );
+				//m_pXmlWriter->WriteAttribute( L"w:type", L"continuationSeparator");
+				//m_pXmlWriter->WriteAttribute( L"w:id", L"0");
+				//m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+
+				//m_pXmlWriter->WriteString(L"<w:p><w:pPr><w:spacing w:lineRule=\"auto\" w:line=\"240\" w:after=\"0\"/></w:pPr><w:r></w:r><w:r><w:continuationSeparator/></w:r></w:p>");
+				//m_pXmlWriter->WriteNodeEnd( L"w:footnote");
 
 				int cp = m_document->FIB->m_RgLw97.ccpText;
 

ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -46,7 +46,7 @@ std::wstring readXstz(VirtualStreamReader *reader)
 
 	std::wstring ret;
 
-	if (cch > 0)
+	if (cch > 0 && cch < 0x0fff)
 	{
 		std::shared_ptr<unsigned char>data = std::shared_ptr<unsigned char>(reader->ReadBytes(cch * 2, true));	
 #if defined(_WIN32) || defined(_WIN64)
@@ -134,6 +134,8 @@ FormFieldData::FormFieldData( int type, const CharacterPropertyExceptions* chpx,
 				bNilPICFAndBinData = true; // or bPICFAndOfficeArtData - shape, pic, ole
 			}
 			break;
+			default:
+				break;
 		}
 	}
 

ASCOfficeDocFile/DocDocxConverter/FormFieldData.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FormFieldDataMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPage.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPageCHPX.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPageCHPX.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/Global.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/HeaderAndFooterTable.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/HeaderAndFooterTable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/HeaderMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/IBinaryReader.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/IMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/IVisitable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/LanguageId.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/LineSpacingDescriptor.h

@@ -1,5 +1,5 @@
 /*
-* (c) Copyright Ascensio System SIA 2010-2018
+* (c) Copyright Ascensio System SIA 2010-2019
 *
 * 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)
@@ -12,8 +12,8 @@
 * 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.
+* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+* street, Riga, Latvia, EU, LV-1050.
 *
 * The  interactive user interfaces in modified source and object code versions
 * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/ListData.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -32,6 +32,8 @@
 
 #include "ListData.h"
 
+#include <boost/make_shared.hpp>
+
 #include <algorithm> 
 #include <functional> 
 #include <cctype>
@@ -46,6 +48,11 @@ namespace DocFileFormat
 		RELEASEOBJECT(rglvl);
 	}
 
+	ListDataPtr ListData::create(VirtualStreamReader* reader, int length)
+	{
+		return boost::make_shared<ListData>(reader, length);
+	}
+
 	// Parses the StreamReader to retrieve a ListData
 
 	ListData::ListData(VirtualStreamReader* reader, int length) : rglvl(NULL)
@@ -80,9 +87,85 @@ namespace DocFileFormat
 
 		grfhic		= reader->ReadByte();
 	}
+	NumberingDescriptorPtr NumberingDescriptor::create(unsigned char * data, int length)
+	{
+		return boost::make_shared<NumberingDescriptor>(data, length);
+	}
+	bool NumberingDescriptor::operator == (const NumberingDescriptor & val) const
+	{
+		const bool res =     
+		nfc				== val.nfc &&
+		cbTextBefore	== val.cbTextBefore &&
+		cbTextAfter		== val.cbTextAfter &&
+		jc				== val.jc &&
+		fPrev			== val.fPrev &&
+		fHang			== val.fHang &&
+		fSetBold		== val.fSetBold &&
+		fSetItalic		== val.fSetItalic &&
+		fSetSmallCaps	== val.fSetSmallCaps &&
+		fSetCaps		== val.fSetCaps &&
+		fSetStrike		== val.fSetStrike &&
+		fSetKul			== val.fSetKul &&
+		fPrevSpace		== val.fPrevSpace &&
+		fBold			== val.fBold &&
+		fItalic			== val.fItalic &&
+		fSmallCaps		== val.fSmallCaps &&
+		fCaps			== val.fCaps &&
+		fStrike			== val.fStrike &&
+		kul				== val.kul &&
+		ico				== val.ico &&
+		ftc				== val.ftc &&
+		hps				== val.hps &&
+		iStartAt		== val.iStartAt &&
+		dxaIndent		== val.dxaIndent &&
+		dxaSpace		== val.dxaSpace &&
+		fNumber1		== val.fNumber1 &&
+		fNumberAcross	== val.fNumberAcross &&
+		fRestartHdn		== val.fRestartHdn &&
+		fSpareX			== val.fSpareX;
 
+		return res;
+	}
+	bool NumberingDescriptor::operator == (const NumberingDescriptorPtr & val) const
+	{
+		if (!val) return false;
+		const bool res =     
+		nfc				== val->nfc &&
+		cbTextBefore	== val->cbTextBefore &&
+		cbTextAfter		== val->cbTextAfter &&
+		jc				== val->jc &&
+		fPrev			== val->fPrev &&
+		fHang			== val->fHang &&
+		fSetBold		== val->fSetBold &&
+		fSetItalic		== val->fSetItalic &&
+		fSetSmallCaps	== val->fSetSmallCaps &&
+		fSetCaps		== val->fSetCaps &&
+		fSetStrike		== val->fSetStrike &&
+		fSetKul			== val->fSetKul &&
+		fPrevSpace		== val->fPrevSpace &&
+		fBold			== val->fBold &&
+		fItalic			== val->fItalic &&
+		fSmallCaps		== val->fSmallCaps &&
+		fCaps			== val->fCaps &&
+		fStrike			== val->fStrike &&
+		kul				== val->kul &&
+		ico				== val->ico &&
+		ftc				== val->ftc &&
+		hps				== val->hps &&
+		iStartAt		== val->iStartAt &&
+		dxaIndent		== val->dxaIndent &&
+		dxaSpace		== val->dxaSpace &&
+		fNumber1		== val->fNumber1 &&
+		fNumberAcross	== val->fNumberAcross &&
+		fRestartHdn		== val->fRestartHdn &&
+		fSpareX			== val->fSpareX;
+
+		return res;
+
+	}
 	NumberingDescriptor::NumberingDescriptor( unsigned char * data, int length )
 	{
+		id				= 0;
 		nfc				= FormatUtils::BytesToUChar(data, 0, length);
 		cbTextBefore	= FormatUtils::BytesToUChar(data, 1, length);
 		cbTextAfter		= FormatUtils::BytesToUChar(data, 2, length);

ASCOfficeDocFile/DocDocxConverter/ListData.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -36,6 +36,9 @@
 
 namespace DocFileFormat
 {
+	class ListData;
+	typedef class boost::shared_ptr<ListData> ListDataPtr;
+
 	class ListData
 	{
 		friend class ListTable;
@@ -74,15 +77,20 @@ namespace DocFileFormat
 
 		virtual ~ListData();
 		ListData( VirtualStreamReader* reader, int length );
+
+		static ListDataPtr create(VirtualStreamReader* reader, int length);
 	};
 
+	class NumberingDescriptor;
+	typedef class boost::shared_ptr<NumberingDescriptor> NumberingDescriptorPtr;
+	
 	class NumberingDescriptor : public IVisitable
 	{
 		friend class ListTable;
 		friend class NumberingMapping;
 	
 	private:
-
+		size_t			id;
 		unsigned char	nfc;
 		unsigned char	cbTextBefore;
 		unsigned char	cbTextAfter;
@@ -121,9 +129,15 @@ namespace DocFileFormat
 		std::wstring	xst; //32 chars ansi
 
 	public:
+
+		bool operator == (const NumberingDescriptor & val) const;
+		bool operator == (const NumberingDescriptorPtr & val) const;
+
 		virtual ~NumberingDescriptor(){}
 		// Parses the given StreamReader to retrieve a ANLD struct
 		NumberingDescriptor( unsigned char * data, int length ); //cbANLD (count of bytes of ANLD) is 52 
+		
+		static NumberingDescriptorPtr create(unsigned char * data, int length);
 	};
 
 	

ASCOfficeDocFile/DocDocxConverter/ListFormatOverride.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/ListFormatOverrideLevel.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/ListFormatOverrideTable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/ListLevel.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/ListLevel.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/ListTable.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -38,7 +38,6 @@ namespace DocFileFormat
 {
 	ListTable::~ListTable()
 	{
-		for_each( this->listData.begin(), this->listData.end(), DeleteDynamicObject() );
 	}
 
 	ListTable::ListTable( FileInformationBlock* fib, POLE::Stream* tableStream )
@@ -59,23 +58,32 @@ namespace DocFileFormat
 			//read the LSTF structs
 			for ( int i = 0; i < count; i++ )
 			{
-				listData.push_back( new ListData( &reader, ListData::VARIABLE_LENGTH ) );
+				listData.push_back( ListData::create( &reader, ListData::VARIABLE_LENGTH ) );
 			}
 
 			//read the LVLF structs
-			for ( std::list<ListData*>::iterator iter = listData.begin(); iter != listData.end(); iter++ )
+			for ( size_t i = 0; i < listData.size(); ++i)
 			{
-				for ( unsigned int j = 0; j < (*iter)->rglvl->size(); j++ )
+				for ( size_t j = 0; j < listData[i]->rglvl->size(); j++ )
 				{
-					(*iter)->rglvl->operator []( j ) = new ListLevel( &reader, ListData::VARIABLE_LENGTH );
+					listData[i]->rglvl->operator []( j ) = new ListLevel( &reader, ListData::VARIABLE_LENGTH );
 				}
 			}
 		}
 	}
 
-	void ListTable::appendNumbering( const NumberingDescriptor & desc )
+	size_t ListTable::appendNumbering( NumberingDescriptorPtr &desc )
 	{
+		for (size_t i = 0; i < listNumbering.size(); ++i)
+		{
+			if (listNumbering[i]->operator==(desc))
+			{
+				return listNumbering[i]->id;
+			}
+		}
+		desc->id = listData.size() + listNumbering.size()/* + 1*/;
 		listNumbering.push_back(desc);
+		return desc->id;
 	}
 
 }

ASCOfficeDocFile/DocDocxConverter/ListTable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -41,12 +41,12 @@ namespace DocFileFormat
   class ListTable: public IVisitable
   {
     public: 
-		std::list<ListData*>			listData;
-		std::list<NumberingDescriptor>	listNumbering;
+		std::vector<ListDataPtr>			listData;
+		std::vector<NumberingDescriptorPtr>	listNumbering;
 
 		virtual ~ListTable();
 		ListTable( FileInformationBlock* fib, POLE::Stream* tableStream );
 
-		void appendNumbering( const NumberingDescriptor & desc );
+		size_t appendNumbering( NumberingDescriptorPtr &desc );
   };
 }

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -59,35 +59,52 @@ namespace DocFileFormat
 		m_pXmlWriter->WriteAttribute(L"xmlns:w",		OpenXmlNamespaces::WordprocessingML );
 		m_pXmlWriter->WriteAttribute(L"xmlns:v",		OpenXmlNamespaces::VectorML );
 		m_pXmlWriter->WriteAttribute(L"xmlns:o",		OpenXmlNamespaces::Office );
-		m_pXmlWriter->WriteAttribute(L"xmlns:w10",		OpenXmlNamespaces::OfficeWord );
 		m_pXmlWriter->WriteAttribute(L"xmlns:r",		OpenXmlNamespaces::Relationships );
+		m_pXmlWriter->WriteAttribute(L"xmlns:w10",		OpenXmlNamespaces::OfficeWord );
 		m_pXmlWriter->WriteAttribute(L"xmlns:m",		L"http://schemas.openxmlformats.org/officeDocument/2006/math");
 
-		//m_pXmlWriter->WriteAttribute(L"xmlns:wpc",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas");
-		//m_pXmlWriter->WriteAttribute(L"xmlns:mc",		L"http://schemas.openxmlformats.org/markup-compatibility/2006"); 
-		//m_pXmlWriter->WriteAttribute(L"xmlns:wp14",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing");
-		//m_pXmlWriter->WriteAttribute(L"xmlns:wp",		L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
-		//m_pXmlWriter->WriteAttribute(L"xmlns:w14",	L"http://schemas.microsoft.com/office/word/2010/wordml");
-		//m_pXmlWriter->WriteAttribute(L"xmlns:wpg",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup");
-		//m_pXmlWriter->WriteAttribute(L"xmlns:wpi",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk");
-		//m_pXmlWriter->WriteAttribute(L"xmlns:wne",	L"http://schemas.microsoft.com/office/word/2006/wordml");
-		//m_pXmlWriter->WriteAttribute(L"xmlns:wps",	L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape");
-		//m_pXmlWriter->WriteAttribute(L"mc:Ignorable", L"w14 wp14");
-		
-		m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+		m_pXmlWriter->WriteAttribute(L"xmlns:wpc",		L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas");
+		m_pXmlWriter->WriteAttribute(L"xmlns:cx",		L"http://schemas.microsoft.com/office/drawing/2014/chartex");
+		m_pXmlWriter->WriteAttribute(L"xmlns:cx1",		L"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex");
+		m_pXmlWriter->WriteAttribute(L"xmlns:mc",		L"http://schemas.openxmlformats.org/markup-compatibility/2006"); 
+		m_pXmlWriter->WriteAttribute(L"xmlns:wp14",		L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing");
+		m_pXmlWriter->WriteAttribute(L"xmlns:wp",		L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
+		m_pXmlWriter->WriteAttribute(L"xmlns:w14",		L"http://schemas.microsoft.com/office/word/2010/wordml");
+		m_pXmlWriter->WriteAttribute(L"xmlns:w15",		L"http://schemas.microsoft.com/office/word/2012/wordml");
+		m_pXmlWriter->WriteAttribute(L"xmlns:w16se",	L"http://schemas.microsoft.com/office/word/2015/wordml/symex");
+		m_pXmlWriter->WriteAttribute(L"xmlns:wpg",		L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup");
+		m_pXmlWriter->WriteAttribute(L"xmlns:wpi",		L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk");
+		m_pXmlWriter->WriteAttribute(L"xmlns:wne",		L"http://schemas.microsoft.com/office/word/2006/wordml");
+		m_pXmlWriter->WriteAttribute(L"xmlns:wps",		L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape");
+		m_pXmlWriter->WriteAttribute(L"mc:Ignorable",	L"w14 w15 w16se wp14");
+	
+
+		  m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 		if ((m_document->GetOfficeArt()) && (m_document->GetOfficeArt()->GetShapeBackgound()))
 		{
+			bool bFilled = true;
 			m_document->DocProperties->bDisplayBackgroundShape = true;
 			ShapeContainer* pShape = m_document->GetOfficeArt()->GetShapeBackgound();
 
-			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");
+			ODRAW::OfficeArtFOPTEPtr boolFill = pShape->ExtractOption(fillStyleBooleanProperties);
+
+			ODRAW::FillStyleBooleanProperties* booleans = dynamic_cast<ODRAW::FillStyleBooleanProperties*>(boolFill.get());
+
+			if (booleans && (booleans->fUsefFilled && !booleans->fFilled))
+			{
+				bFilled = false;
+			}
+			if (bFilled)
+			{
+				m_pXmlWriter->WriteNodeBegin ( L"w:background", TRUE);
+					m_pXmlWriter->WriteAttribute ( L"w:color", L"FFFFFF");
+				m_pXmlWriter->WriteNodeEnd( L"",  TRUE, FALSE );
+				
+				VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, NULL,  _caller);
+					pShape->Convert(&oVmlWriter);
+				m_pXmlWriter->WriteNodeEnd (L"w:background");
+			}
 		}
 
 		m_pXmlWriter->WriteNodeBegin( L"w:body", FALSE );

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/MemoryStream.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -78,7 +78,14 @@ public:
 
 		return rdUShort;
 	}
-
+	void WriteUInt16(unsigned short val)
+	{
+		if (m_Data)
+		{
+			((unsigned short *)(m_Data + m_Position))[0] = val;
+			m_Position	+=	sizeof(unsigned short);
+		}
+	}
 	virtual short ReadInt16()
 	{
 		short rdShort = 0;
@@ -104,7 +111,14 @@ public:
 
 		return rdInt;
 	}
-
+	void WriteInt32(_INT32 val)
+	{
+		if (m_Data)
+		{
+			((_INT32 *)(m_Data + m_Position))[0] = val;
+			m_Position	+=	sizeof(_INT32);
+		}
+	}
 	virtual unsigned int ReadUInt32()
 	{
 		int rdUInt = 0;
@@ -117,7 +131,22 @@ public:
 
 		return rdUInt;
 	}
-
+	void WriteByte(unsigned char val)
+	{
+		if (m_Data)
+		{
+			m_Data[m_Position] = val;
+			m_Position	+= 1;
+		}
+	}
+	void WriteUInt32(_UINT32 val)
+	{
+		if (m_Data)
+		{
+			((_UINT32 *)(m_Data + m_Position))[0] = val;
+			m_Position	+=	sizeof(_UINT32);
+		}
+	}
 	virtual unsigned char ReadByte()
 	{
 		unsigned char rdByte = 0;
@@ -159,6 +188,14 @@ public:
 
 		return pBytes;
 	}
+	void WriteBytes(unsigned char* pData, int size)
+	{
+		if (m_Data)
+		{
+			memcpy(m_Data + m_Position, pData, size);
+			m_Position += size;
+		}
+	}
 
 	virtual unsigned long GetPosition() const
 	{
@@ -172,7 +209,7 @@ public:
 
     virtual int Seek (int offset, int origin = 0/*STREAM_SEEK_SET*/)
 	{
-		if ( (m_Data != NULL) && (offset > 0) && ((unsigned int)offset < m_Size) )
+		if ( (m_Data != NULL) && (offset >= 0) && ((unsigned int)offset < m_Size) )
 			return m_Position = offset;
 
 		return 0;
@@ -180,7 +217,7 @@ public:
 
 private:
 
-	unsigned char*			m_Data;
+	unsigned char*	m_Data;
 	unsigned long	m_Size;
 	unsigned long	m_Position;
 	bool			bMemoryCopy;

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

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

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -63,7 +63,7 @@ namespace DocFileFormat
 		NumberingMapping(ConversionContext* ctx);
 		void Apply(IVisitable* visited);
 		
-		static int FindIndexbyId(const std::list<ListData*>& listData, int id);
+		static int FindIndexbyId(std::vector<ListDataPtr>& listData, int id);
 		/// Converts the number format code of the binary format.
 		static std::wstring GetNumberFormatWideString(int nfc, int nWordVersion = 0);
 		
@@ -73,12 +73,12 @@ namespace DocFileFormat
 		// Converts the number text of the binary format to the number text of OOXML.
 		// OOXML uses different placeholders for the numbers.
 		std::wstring GetLvlText(const ListLevel* lvl, bool bIsSymbol) const;
-		std::wstring GetLvlText(const NumberingDescriptor& lvl, bool bIsSymbol, int Before, int After) const;
+		std::wstring GetLvlText(NumberingDescriptorPtr& lvl, bool bIsSymbol, int Before, int After) const;
 		
 		static bool IsPlaceholder(wchar_t symbol);
 		
 		void LevelMapping(const ListLevel* lvl, unsigned int level, short styleIndex);
-		void LevelMapping(const NumberingDescriptor& lvl, unsigned int level);
+		void LevelMapping(NumberingDescriptorPtr & lvl, unsigned int level);
 
 		void PictureBulletsMapping();
 		void WriteLevelPictureBullet(const CharacterPropertyExceptions* grpprlChpx);

ASCOfficeDocFile/DocDocxConverter/OfficeArtContent.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -58,7 +58,7 @@ namespace DocFileFormat
 
 	public:
 
-		OfficeArtContent (const FileInformationBlock* pFIB, POLE::Stream* pStream): m_pDrawingGroupData(NULL), m_pBackgroud(NULL)
+		OfficeArtContent (const FileInformationBlock* pFIB, POLE::Stream* pStream): m_pDrawingGroupData(NULL), m_pBackgroud(NULL), m_uLastShapeId(1024)
 		{
 			VirtualStreamReader oStearmReader(pStream, 0 , pFIB->m_nWordVersion);
 
@@ -79,14 +79,13 @@ namespace DocFileFormat
 					drawing.dgglbl			=	(DrawingType)oStearmReader.ReadByte();
 					drawing.container		=	static_cast<DrawingContainer*>(RecordFactory::ReadRecord (&oStearmReader, 0));
 
-					for (unsigned int i = 0; i < drawing.container->Children.size(); ++i)
+					for (size_t i = 0; i < drawing.container->Children.size(); ++i)
 					{
 						Record* groupChild = drawing.container->Children[i];
 						if (groupChild)
 						{
 							if (GroupContainer::TYPE_CODE_0xF003 == groupChild->TypeCode)
 							{
-								// the child is a subgroup
 								GroupContainer* group	=	static_cast<GroupContainer*>(groupChild);
 								if (group)
 								{
@@ -95,17 +94,24 @@ namespace DocFileFormat
 							}
 							else if (ShapeContainer::TYPE_CODE_0xF004 == groupChild->TypeCode)
 							{
-								// the child is a shape
 								ShapeContainer* shape	=	static_cast<ShapeContainer*>(groupChild);
 								if (shape)
 								{
-									shape->Index = i;
-									if (shape->isBackground())
+									shape->m_nIndex = (int)i;
+									if (shape->m_bBackground)
 									{
 										m_pBackgroud = shape;
 									}
 								}
 							}
+							else if (DrawingRecord::TYPE_CODE_0xF008 == groupChild->TypeCode)
+							{
+								DrawingRecord* dr	=	static_cast<DrawingRecord*>(groupChild);
+								if (dr)
+								{
+									m_uLastShapeId = dr->spidCur;
+								}
+							}
 						}
 					}
 
@@ -134,7 +140,7 @@ namespace DocFileFormat
 				GroupContainer* group = iter->container->FirstChildWithType<GroupContainer>();
 				if (group)
 				{
-					for (unsigned int i = 1; i < group->Children.size(); ++i)
+					for (size_t i = 1; i < group->Children.size(); ++i)
 					{
 						Record* groupChild = group->Children[i];
 
@@ -183,7 +189,7 @@ namespace DocFileFormat
 		{
 			return m_pDrawingGroupData;
 		}
-
+		unsigned int					m_uLastShapeId;
 	private:
 		ShapeContainer*					m_pBackgroud;
 		DrawingGroup*					m_pDrawingGroupData;

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BitmapBlip.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreContainer.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreEntry.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ChildAnchor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientAnchor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under
@@ -40,13 +40,13 @@ namespace DocFileFormat
 	public:
 		static const unsigned short TYPE_CODE_0xF010 = 0xF010;
 
-		ClientAnchor() : Record(), clientanchor(0)
+		ClientAnchor() : Record(), value(0)
 		{
 		}
 
-		ClientAnchor (IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance) : Record (_reader, size, typeCode, version, instance), clientanchor(0)
+		ClientAnchor (IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance) : Record (_reader, size, typeCode, version, instance), value(0)
 		{
-			clientanchor	=	Reader->ReadInt32();
+			value	=	Reader->ReadInt32(); //index PlcfSpa
 		}
 
 		virtual ~ClientAnchor()
@@ -58,8 +58,6 @@ namespace DocFileFormat
 			return new ClientAnchor (_reader, bodySize, typeCode, version, instance);
 		}
 
-	private:
-
-		int	clientanchor;
+		unsigned int value;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientData.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DiagramBooleanProperties.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingContainer.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingGroup.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingGroupRecord.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2018
+ * (c) Copyright Ascensio System SIA 2010-2019
  *
  * 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)
@@ -12,8 +12,8 @@
  * 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.
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
  * of the Program must display Appropriate Legal Notices, as required under