Merge remote-tracking branch 'origin/release/v5.1.0' into develop

x2t version 2.4.520
RtfFormatReader - fix convert document from consultant+
2026-04-07 13:55:33 +08:00 · 2018-03-02 11:12:28 +03:00 · 2018-03-01 20:02:57 +03:00 · 2018-03-01 20:01:04 +03:00 · 2018-03-01 17:25:47 +03:00 · 2018-03-01 16:00:51 +03:00
4987 changed files with 22271 additions and 16485 deletions
--- a/ASCOfficeDocFile/Common/Aggregat.h
+++ b/ASCOfficeDocFile/Common/Aggregat.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/Callback.h
+++ b/ASCOfficeDocFile/Common/Callback.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/FormatUtils.h
+++ b/ASCOfficeDocFile/Common/FormatUtils.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/IOperand.h
+++ b/ASCOfficeDocFile/Common/IOperand.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/IVirtualConstructor.h
+++ b/ASCOfficeDocFile/Common/IVirtualConstructor.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/LanguageCodes.h
+++ b/ASCOfficeDocFile/Common/LanguageCodes.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/SPRMCodes.h
+++ b/ASCOfficeDocFile/Common/SPRMCodes.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/Singleton.h
+++ b/ASCOfficeDocFile/Common/Singleton.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/TargetOptions.h
+++ b/ASCOfficeDocFile/Common/TargetOptions.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/TextMark.h
+++ b/ASCOfficeDocFile/Common/TextMark.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/XmlTools.h
+++ b/ASCOfficeDocFile/Common/XmlTools.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/Common/utf8.h
+++ b/ASCOfficeDocFile/Common/utf8.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/AbstractOpenXmlMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/AbstractOpenXmlMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/AnnotationOwnerList.h
+++ b/ASCOfficeDocFile/DocDocxConverter/AnnotationOwnerList.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.h
+++ b/ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/AutoSummaryInfo.h
+++ b/ASCOfficeDocFile/DocDocxConverter/AutoSummaryInfo.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/BookmarkFirst.h
+++ b/ASCOfficeDocFile/DocDocxConverter/BookmarkFirst.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/BorderCode.h
+++ b/ASCOfficeDocFile/DocDocxConverter/BorderCode.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ByteStructure.h
+++ b/ASCOfficeDocFile/DocDocxConverter/ByteStructure.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/CharacterPropertyExceptions.h
+++ b/ASCOfficeDocFile/DocDocxConverter/CharacterPropertyExceptions.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/CharacterRange.h
+++ b/ASCOfficeDocFile/DocDocxConverter/CharacterRange.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ContentTypes.h
+++ b/ASCOfficeDocFile/DocDocxConverter/ContentTypes.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -69,8 +69,13 @@ namespace OpenXmlContentTypes
    static const wchar_t* Tiff					=	L"image/tiff";
    static const wchar_t* Wmf					=	L"image/x-wmf";
    static const wchar_t* Bmp					=	L"image/bmp";
+	static const wchar_t* Pcz					=	L"image/x-pcz";
+}
+namespace DocPrContentTypes
+{
+    static const wchar_t* App			=	L"application/vnd.openxmlformats-officedocument.extended-properties+xml";
+    static const wchar_t* Core			=	L"application/vnd.openxmlformats-package.core-properties+xml";
 }
-
 namespace WordprocessingMLContentTypes
 {
 	// WordprocessingML content types
@ -136,7 +141,7 @@ namespace OpenXmlNamespaces

 namespace OpenXmlRelationshipTypes
 {
-    static const wchar_t* CoreProperties		=	L"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
+	static const wchar_t* CoreProperties		=	L"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
    static const wchar_t* ExtendedProperties	=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";

    static const wchar_t* Theme					=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme";
--- a/ASCOfficeDocFile/DocDocxConverter/ConversionContext.h
+++ b/ASCOfficeDocFile/DocDocxConverter/ConversionContext.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -47,30 +47,17 @@ namespace DocFileFormat

 		virtual ~ConversionContext()
 		{
-
 		}

-		// Adds a new RSID to the set
 		inline void AddRsid(const std::wstring& rsid)
 		{
 			if (AllRsids.find(rsid) == AllRsids.end())
 				AllRsids.insert(rsid);
 		}

-		inline WordDocument* GetDocument()
-		{
-			return _doc;
-		}
-
-		inline WordprocessingDocument* GetXmlDocument()
-		{
-			return _docx;
-		}
-	
-	public:
 		WordprocessingDocument*		_docx;	
 		WordDocument*				_doc;	
-		/// A set thta contains all revision ids.
+
 		std::set<std::wstring>		AllRsids;
 	};
 }
--- a/ASCOfficeDocFile/DocDocxConverter/Converter.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/Converter.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -63,8 +63,16 @@ namespace DocFileFormat
 {
 	long Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
 	{
+		if (!doc || !docx) return S_FALSE;
+		
 		ConversionContext context( doc, docx );

+	//Write fontTable.xml
+		if (doc->FontTable)
+		{
+			FontTableMapping fontTableMapping( &context );
+			doc->FontTable->Convert( &fontTableMapping );
+		}
 	//Write styles.xml
 		if (doc->Styles)
 		{
@ -107,14 +115,6 @@ namespace DocFileFormat
 				return S_FALSE;
 			}
 		}
-
-	//Write fontTable.xml
-		if (doc->FontTable)
-		{
-			FontTableMapping fontTableMapping( &context );
-			doc->FontTable->Convert( &fontTableMapping );
-		}
-
 		if ( progress != NULL )
 		{
 			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 875000 );
--- a/ASCOfficeDocFile/DocDocxConverter/Converter.h
+++ b/ASCOfficeDocFile/DocDocxConverter/Converter.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/DateAndTime.h
+++ b/ASCOfficeDocFile/DocDocxConverter/DateAndTime.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/DocumentProperties.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/DocumentProperties.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/DocumentProperties.h
+++ b/ASCOfficeDocFile/DocDocxConverter/DocumentProperties.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/DocumentTypographyInfo.h
+++ b/ASCOfficeDocFile/DocDocxConverter/DocumentTypographyInfo.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/DrawingObjectGrid.h
+++ b/ASCOfficeDocFile/DocDocxConverter/DrawingObjectGrid.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.h
+++ b/ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/EmuValue.h
+++ b/ASCOfficeDocFile/DocDocxConverter/EmuValue.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -35,143 +35,148 @@

 namespace DocFileFormat
 {
-	EncryptionHeader::EncryptionHeader( FileInformationBlock* fib, POLE::Stream* tableStream )
+	EncryptionHeader::EncryptionHeader( FileInformationBlock* fib, POLE::Stream* tableStream ) : bStandard(false), bXOR(false), bAES(false)
 	{
 		VirtualStreamReader tStream( tableStream, 0, fib->m_bOlderVersion);

-		if (fib->m_FibBase.fObfuscation)
+		if (fib->m_FibBase.fObfuscation || fib->m_bOlderVersion)
 		{
-			//xor
-			return;
-		}
-		unsigned short vMajor = tStream.ReadUInt16();
-		unsigned short vMinor = tStream.ReadUInt16();
-
-		if(0x0001 == vMajor) // RC4 encryption header structure
-		{// fib->m_FibBase.lKey == 52 
-			bStandard = true;
-
-			crypt_data_rc4.Salt.b1  = tStream.ReadUInt32();
-			crypt_data_rc4.Salt.b2  = tStream.ReadUInt32();
-			crypt_data_rc4.Salt.b3  = tStream.ReadUInt32();
-			crypt_data_rc4.Salt.b4  = tStream.ReadUInt32();
+			bXOR = true;
 			
-			crypt_data_rc4.EncryptedVerifier.b1  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifier.b2  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifier.b3  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifier.b4  = tStream.ReadUInt32();
-			
-			crypt_data_rc4.EncryptedVerifierHash.b1  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifierHash.b2  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifierHash.b3  = tStream.ReadUInt32();
-			crypt_data_rc4.EncryptedVerifierHash.b4  = tStream.ReadUInt32();
+			crypt_data_xor.key  = fib->m_FibBase.lKey >> 16;
+			crypt_data_xor.hash  = fib->m_FibBase.lKey - (crypt_data_xor.key << 16);
 		}
 		else
 		{
-			bStandard				= false;
-			crypt_data_aes.bAgile	= false;
+			unsigned short vMajor = tStream.ReadUInt16();
+			unsigned short vMinor = tStream.ReadUInt16();

-			unsigned short flags = tStream.ReadUInt32();
-			unsigned char *pDataRead = NULL;
+			if(0x0001 == vMajor) // RC4 encryption header structure
+			{// fib->m_FibBase.lKey == 52 
+				bStandard = true;

-			bool fCryptoAPI	= GETBIT(flags, 1);
-			bool fDocProps	= GETBIT(flags, 2);
-			bool fExternal	= GETBIT(flags, 3);
-			bool fAES		= GETBIT(flags, 4);
-
-		//EncryptionHeader
-			int HeaderSize	= tStream.ReadUInt32();
-			int Flags		= tStream.ReadUInt32();
-			int SizeExtra	= tStream.ReadUInt32();
-			int AlgID		= tStream.ReadUInt32();
-			int AlgIDHash	= tStream.ReadUInt32();
-			int KeySize		= tStream.ReadUInt32();
-			int ProviderType= tStream.ReadUInt32();
-			int Reserved1	= tStream.ReadUInt32();
-			int Reserved2	= tStream.ReadUInt32();
-
-			int pos		= tStream.GetPosition();
-			int size	= tStream.GetSize();
-
-			std::vector<char> dataCSPName;
-			while(pos  < size - 1)
+				crypt_data_rc4.Salt.b1  = tStream.ReadUInt32();
+				crypt_data_rc4.Salt.b2  = tStream.ReadUInt32();
+				crypt_data_rc4.Salt.b3  = tStream.ReadUInt32();
+				crypt_data_rc4.Salt.b4  = tStream.ReadUInt32();
+				
+				crypt_data_rc4.EncryptedVerifier.b1  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifier.b2  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifier.b3  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifier.b4  = tStream.ReadUInt32();
+				
+				crypt_data_rc4.EncryptedVerifierHash.b1  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifierHash.b2  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifierHash.b3  = tStream.ReadUInt32();
+				crypt_data_rc4.EncryptedVerifierHash.b4  = tStream.ReadUInt32();
+			}
+			else
 			{
-				dataCSPName.push_back(tStream.ReadByte());
-				dataCSPName.push_back(tStream.ReadByte());
-				if (dataCSPName[dataCSPName.size() - 1] == 0 && dataCSPName[dataCSPName.size() - 2] == 0)
+				bAES					= true;
+				crypt_data_aes.bAgile	= false;
+
+				unsigned short flags = tStream.ReadUInt32();
+				unsigned char *pDataRead = NULL;
+
+				bool fCryptoAPI				= GETBIT(flags, 1);
+				crypt_data_aes.fDocProps	= GETBIT(flags, 2);
+				bool fExternal				= GETBIT(flags, 3);
+				bool fAES					= GETBIT(flags, 4);
+
+			//EncryptionHeader
+				int HeaderSize	= tStream.ReadUInt32();
+				int Flags		= tStream.ReadUInt32();
+				int SizeExtra	= tStream.ReadUInt32();
+				int AlgID		= tStream.ReadUInt32();
+				int AlgIDHash	= tStream.ReadUInt32();
+				int KeySize		= tStream.ReadUInt32();
+				int ProviderType= tStream.ReadUInt32();
+				int Reserved1	= tStream.ReadUInt32();
+				int Reserved2	= tStream.ReadUInt32();
+
+				int pos		= tStream.GetPosition();
+				int size	= tStream.GetSize();
+
+				std::vector<char> dataCSPName;
+				while(pos  < size - 1)
 				{
+					dataCSPName.push_back(tStream.ReadByte());
+					dataCSPName.push_back(tStream.ReadByte());
+					if (dataCSPName[dataCSPName.size() - 1] == 0 && dataCSPName[dataCSPName.size() - 2] == 0)
+					{
+						break;
+					}
+					pos+=2;//unicode null-terminate string
+				}
+			//EncryptionVerifier
+				crypt_data_aes.saltSize = tStream.ReadUInt32();
+				pDataRead = tStream.ReadBytes(crypt_data_aes.saltSize, true);
+				if (pDataRead)
+				{
+					crypt_data_aes.saltValue = std::string((char*)pDataRead, crypt_data_aes.saltSize);	
+					delete pDataRead;
+				}
+				
+				pDataRead = tStream.ReadBytes(0x10, true);
+				if (pDataRead)
+				{
+					crypt_data_aes.encryptedVerifierInput = std::string((char*)pDataRead, 0x10);
+					delete pDataRead;
+				}
+
+				crypt_data_aes.hashSize = tStream.ReadUInt32();
+						
+				int szEncryptedVerifierHash = (ProviderType == 0x0001) ? 0x14 : 0x20;
+				pDataRead = tStream.ReadBytes(szEncryptedVerifierHash, true);
+				if (pDataRead)
+				{
+					crypt_data_aes.encryptedVerifierValue = std::string((char*)pDataRead, szEncryptedVerifierHash);
+					delete pDataRead;
+				}
+
+				pos = tStream.GetPosition();
+				
+			//------------------------------------------------------------------------------------------
+				switch(AlgIDHash)
+				{
+					case 0x8003: crypt_data_aes.hashAlgorithm = CRYPT_METHOD::MD5;	break;
+					case 0x0000: 
+					case 0x8004: crypt_data_aes.hashAlgorithm = CRYPT_METHOD::SHA1;	break;
+				}
+				crypt_data_aes.spinCount = 0;
+
+				switch(AlgID)
+				{
+				case 0x0000:
+					if (fAES)		crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
+					if (fCryptoAPI)	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;	
+					crypt_data_aes.keySize = KeySize / 8;
+				case 0x6801:	
+					crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		
+					crypt_data_aes.keySize = KeySize / 8;
+					
+					if (crypt_data_aes.keySize == 0)	crypt_data_aes.keySize = 5; // 40 bit
+					break;
+				case 0x660E:	
+					crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
+					crypt_data_aes.keySize	= 128 /8;	
+					break;
+				case 0x660F:	
+					crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
+					crypt_data_aes.keySize	= 192 /8;	
+					break;
+				case 0x6610:	
+					crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
+					crypt_data_aes.keySize	= 256 /8;	
 					break;
 				}
-				pos+=2;//unicode null-terminate string
-			}
-		//EncryptionVerifier
-			crypt_data_aes.saltSize = tStream.ReadUInt32();
-			pDataRead = tStream.ReadBytes(crypt_data_aes.saltSize, true);
-			if (pDataRead)
-			{
-				crypt_data_aes.saltValue = std::string((char*)pDataRead, crypt_data_aes.saltSize);	
-				delete pDataRead;
-			}
-			
-			pDataRead = tStream.ReadBytes(0x10, true);
-			if (pDataRead)
-			{
-				crypt_data_aes.encryptedVerifierInput = std::string((char*)pDataRead, 0x10);
-				delete pDataRead;
-			}

-			crypt_data_aes.hashSize = tStream.ReadUInt32();
-					
-			int szEncryptedVerifierHash = (ProviderType == 0x0001) ? 0x14 : 0x20;
-			pDataRead = tStream.ReadBytes(szEncryptedVerifierHash, true);
-			if (pDataRead)
-			{
-				crypt_data_aes.encryptedVerifierValue = std::string((char*)pDataRead, szEncryptedVerifierHash);
-				delete pDataRead;
+				//switch(ProviderType)
+				//{
+				//	case 0x0001:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		break;
+				//	case 0x0018:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB; break;
+				//}
 			}
-
-			pos = tStream.GetPosition();
-			
-		//------------------------------------------------------------------------------------------
-			switch(AlgIDHash)
-			{
-				case 0x8003: crypt_data_aes.hashAlgorithm = CRYPT_METHOD::MD5;	break;
-				case 0x0000: 
-				case 0x8004: crypt_data_aes.hashAlgorithm = CRYPT_METHOD::SHA1;	break;
-			}
-			crypt_data_aes.spinCount = 0;
-
-			switch(AlgID)
-			{
-			case 0x0000:
-				if (fAES)		crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
-				if (fCryptoAPI)	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;	
-				crypt_data_aes.keySize = KeySize / 8;
-			case 0x6801:	
-				crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		
-				crypt_data_aes.keySize = KeySize / 8;
-				
-				if (crypt_data_aes.keySize == 0)	crypt_data_aes.keySize = 5; // 40 bit
-				break;
-			case 0x660E:	
-				crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
-				crypt_data_aes.keySize	= 128 /8;	
-				break;
-			case 0x660F:	
-				crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
-				crypt_data_aes.keySize	= 192 /8;	
-				break;
-			case 0x6610:	
-				crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB;
-				crypt_data_aes.keySize	= 256 /8;	
-				break;
-			}
-
-			//switch(ProviderType)
-			//{
-			//	case 0x0001:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		break;
-			//	case 0x0018:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB; break;
-			//}
 		}
 	}
 }
--- a/ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.h
+++ b/ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -52,6 +52,10 @@ namespace DocFileFormat
 	private:    
 		CRYPT::_rc4CryptData	crypt_data_rc4;
 		CRYPT::_ecmaCryptData	crypt_data_aes;
+		CRYPT::_xorCryptData	crypt_data_xor;
+		
 		bool					bStandard;
+		bool					bXOR;
+		bool					bAES;
 	};
 }
--- a/ASCOfficeDocFile/DocDocxConverter/EndnoteDescriptor.h
+++ b/ASCOfficeDocFile/DocDocxConverter/EndnoteDescriptor.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FieldCharacter.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FieldCharacter.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FileInformationBlock.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FileInformationBlock.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -531,7 +531,6 @@ namespace DocFileFormat
 		{
            if (m_FibBase.nFib > 0 && m_FibBase.nFib <= Fib1995)
 			{
-				m_RgLw97.cbMac				= reader.ReadInt32();//32
 				/*m_FibWord97.fcSpare0	= */reader.ReadInt32();
 				/*m_FibWord97.fcSpare1	= */reader.ReadInt32();
 				/*m_FibWord97.fcSpare2	= */reader.ReadInt32();
@ -1220,9 +1219,12 @@ namespace DocFileFormat
 			if (m_FibBase.nFib  > Fib1995)
 				csw = reader.ReadUInt16(); //32

-            if (m_FibBase.nFib > Fib1995 || m_FibBase.nFib == 0)
-			{	
-				
+			if (m_FibBase.nFib > 0 && m_FibBase.nFib <= Fib1995)
+			{
+				m_RgLw97.cbMac = reader.ReadInt32();//32
+			}
+			else if (m_FibBase.nFib > Fib1995 || m_FibBase.nFib == 0)
+			{					
 				//read the RgW97
 				reader.ReadBytes( 26, false ); //34 
 				m_RgW97.lidFE = reader.ReadUInt16(); //60
@ -1231,7 +1233,7 @@ namespace DocFileFormat

 				//read the RgLW97

-				m_RgLw97.cbMac		=	reader.ReadInt32(); //64
+				m_RgLw97.cbMac =	reader.ReadInt32(); //64
 			}
 			reset(reader);
 		}
--- a/ASCOfficeDocFile/DocDocxConverter/FixedPointNumber.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FixedPointNumber.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FontFamilyName.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/FontFamilyName.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FontFamilyName.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FontFamilyName.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -48,7 +48,8 @@ namespace DocFileFormat

  class FontFamilyName: public ByteStructure
  {
-    friend class CharacterPropertiesMapping;
+	friend class WordDocument;
+	friend class CharacterPropertiesMapping;
 	friend class DocumentMapping;
 	friend class FontTableMapping;
 	friend class StyleSheetMapping;
--- a/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,32 +34,30 @@

 namespace DocFileFormat
 {
-	FontTableMapping::FontTableMapping( ConversionContext* ctx ): AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() )
+	FontTableMapping::FontTableMapping( ConversionContext* ctx ) : AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() )
 	{
 		_ctx = ctx;
 	}

-	/*========================================================================================================*/

 	FontTableMapping::~FontTableMapping()
 	{
 		RELEASEOBJECT (m_pXmlWriter);
 	}

-	/*========================================================================================================*/

 	void FontTableMapping::Apply( IVisitable* visited )
 	{
 		StringTable<FontFamilyName>* table = static_cast<StringTable<FontFamilyName>*>( visited );

-		this->_ctx->_docx->RegisterFontTable();
+		_ctx->_docx->RegisterFontTable();

        m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
        m_pXmlWriter->WriteNodeBegin( L"w:fonts", TRUE );
        m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
        m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );

-		int sz_fonts	= table->Data.size();
+		int sz_fonts = table->Data.size();
 		int users_fonts = 0;

 		for ( std::vector<ByteStructure*>::iterator iter = table->Data.begin(); iter != table->Data.end(); iter++ )
@ -140,6 +138,6 @@ namespace DocFileFormat

        m_pXmlWriter->WriteNodeEnd( L"w:fonts");

-		this->_ctx->_docx->FontTableXML = std::wstring( m_pXmlWriter->GetXmlString() );
+		_ctx->_docx->FontTableXML = m_pXmlWriter->GetXmlString() ;
 	}
 }
--- a/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FooterMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FooterMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FootnoteDescriptor.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FootnoteDescriptor.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FormFieldData.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FormFieldData.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FormFieldDataMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FormFieldDataMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FormattedDiskPage.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FormattedDiskPage.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FormattedDiskPageCHPX.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/FormattedDiskPageCHPX.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FormattedDiskPageCHPX.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FormattedDiskPageCHPX.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/Global.h
+++ b/ASCOfficeDocFile/DocDocxConverter/Global.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/HeaderAndFooterTable.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/HeaderAndFooterTable.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/HeaderAndFooterTable.h
+++ b/ASCOfficeDocFile/DocDocxConverter/HeaderAndFooterTable.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/HeaderMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/HeaderMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/IBinaryReader.h
+++ b/ASCOfficeDocFile/DocDocxConverter/IBinaryReader.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/IMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/IMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/IVisitable.h
+++ b/ASCOfficeDocFile/DocDocxConverter/IVisitable.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/LanguageId.h
+++ b/ASCOfficeDocFile/DocDocxConverter/LanguageId.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/LineSpacingDescriptor.h
+++ b/ASCOfficeDocFile/DocDocxConverter/LineSpacingDescriptor.h
@ -1,5 +1,5 @@
 /*
-* (c) Copyright Ascensio System SIA 2010-2017
+* (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ListData.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/ListData.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ListData.h
+++ b/ASCOfficeDocFile/DocDocxConverter/ListData.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ListFormatOverride.h
+++ b/ASCOfficeDocFile/DocDocxConverter/ListFormatOverride.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ListFormatOverrideLevel.h
+++ b/ASCOfficeDocFile/DocDocxConverter/ListFormatOverrideLevel.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ListFormatOverrideTable.h
+++ b/ASCOfficeDocFile/DocDocxConverter/ListFormatOverrideTable.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ListLevel.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/ListLevel.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ListLevel.h
+++ b/ASCOfficeDocFile/DocDocxConverter/ListLevel.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ListTable.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/ListTable.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/ListTable.h
+++ b/ASCOfficeDocFile/DocDocxConverter/ListTable.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/MemoryStream.h
+++ b/ASCOfficeDocFile/DocDocxConverter/MemoryStream.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -38,8 +38,8 @@ namespace DocFileFormat
 	{
 		if (m_context)
 		{
-			m_document		=	m_context->GetDocument();
-			m_xmldocument	=	m_context->GetXmlDocument();
+			m_document		=	m_context->_doc;
+			m_xmldocument	=	m_context->_docx;
 		}
 	}

--- a/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeArtContent.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeArtContent.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BitmapBlip.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BitmapBlip.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreContainer.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreContainer.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreEntry.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreEntry.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -110,6 +110,11 @@ namespace DocFileFormat
 			unused2		=	Reader->ReadByte();
 			unused3		=	Reader->ReadByte();

+			if (btMacOS != btWin32)
+			{
+				btWin32 = btMacOS = (Global::BlipType)this->Instance;
+			}
+
 			if (BodySize > 0x24)
 			{
 				Blip	=	RecordFactory::ReadRecord(Reader, 0);
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ChildAnchor.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ChildAnchor.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientAnchor.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientAnchor.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientData.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientData.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DiagramBooleanProperties.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DiagramBooleanProperties.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingContainer.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingContainer.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingGroup.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingGroup.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingGroupRecord.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingGroupRecord.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingRecord.h
+++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingRecord.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ElenaSubbotina	f0cd60b93c	Merge remote-tracking branch 'origin/release/v5.1.0' into develop	2018-03-02 11:12:28 +03:00
ElenaSubbotina	ca9e385bbc	x2t version 2.4.520	2018-03-01 20:02:57 +03:00
ElenaSubbotina	cfe9398ff0	RtfFormatReader - fix convert document from consultant+	2018-03-01 20:01:04 +03:00
Alexey Golubev	16728b5195	Escape to build openssl twice	2018-03-01 17:25:47 +03:00
Alexey Golubev	c53b93b24c	Merge pull request #61 from ONLYOFFICE/feature/update-copyright Update copyright to 2018	2018-03-01 16:00:51 +03:00
Pavel Lobashov	c3cd1afa85	Update copyright to 2018	2018-03-01 14:30:24 +03:00
Oleg Korshul	84f1c05d5f	[v8] reset to no use shapshot	2018-03-01 11:57:53 +03:00
ElenaSubbotina	49aa15a751	Merge remote-tracking branch 'origin/release/v5.1.0' into develop	2018-02-28 19:59:59 +03:00
ElenaSubbotina	0c5410df72	x2t - metafile test	2018-02-28 19:58:41 +03:00
ElenaSubbotina	9b3c92d5f5	x2t - fix errors content after tesing rtf->docx, xls->xlsx	2018-02-28 19:57:56 +03:00
Oleg Korshul	a4881cd241	[fonts] Fix bug with font selection	2018-02-28 15:05:01 +03:00
Alexey Golubev	4b6a14f617	Fix launching featch_linux_correct.sh	2018-02-28 14:48:43 +03:00
Alexey Golubev	c4013d747c	Fix shell syntax	2018-02-28 14:07:04 +03:00
ElenaSubbotina	98e31947cc	OdfFormatWriter - fix bug #37016	2018-02-28 12:38:08 +03:00
Alexey Golubev	86378add6a	Merge branch 'release/v5.1.0' of github.com:ONLYOFFICE/core into release/v5.1.0	2018-02-27 19:54:53 +03:00
Alexey Golubev	d00536d05d	Disable paralell build	2018-02-27 18:36:30 +03:00
Alexey Golubev	377d79cfc6	Remove multithread make use MAKEFLAGS instead	2018-02-27 17:03:54 +03:00
ElenaSubbotina	cfe59582fc	x2t - convert bigest meta file in raster without svg	2018-02-27 11:50:19 +03:00
Oleg Korshul	2256d3ae5d	[v8] switch to external_snapshot lib	2018-02-27 06:07:47 +03:00
Oleg Korshul	a8b57060ce	[v8] correct libs	2018-02-27 04:02:21 +03:00
Oleg Korshul	655dd97626	Merge pull request #60 from ONLYOFFICE/feature/v8_6.0 Feature/v8 6.0	2018-02-27 13:18:52 +03:00
Oleg Korshul	451b4920c7	Merge branch 'release/v5.1.0' into feature/v8_6.0	2018-02-27 13:18:26 +03:00
ElenaSubbotina	b214dc93d8	XlsFormatReader - fix convert elements chart; fix convert color scale cond. format	2018-02-26 19:37:14 +03:00
Alexey Golubev	a2d0c4ad7d	Fix build 3rd-party on macOS	2018-02-26 14:57:24 +03:00
Oleg Korshul	43f29d2877	[bug] Fix bug 35691	2018-02-26 13:29:37 +03:00
ElenaSubbotina	5f5f22a0f0	Merge branch 'release/v5.1.0' of https://github.com/ONLYOFFICE/core into release/v5.1.0	2018-02-26 12:03:27 +03:00
ElenaSubbotina	5256afe04c	x2t version up 2.4.519	2018-02-26 12:05:13 +03:00
ElenaSubbotina	b9080eb9c2	XlsFormat - workbook protections	2018-02-24 14:08:58 +03:00
ElenaSubbotina	5649fb3e2e	RtfFormat; XlsFormat - extended chart layouts for series, titles	2018-02-24 12:54:55 +03:00
Sergey Konovalov	348b8e4045	[x2t][feat] Add Word app version in Editor.bin	2018-02-22 18:32:27 +03:00
Oleg Korshul	2087e9f195	[fonts] AllFontsGen	2018-02-22 18:13:47 +03:00
ElenaSubbotina	ccd84e1850	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop	2018-02-22 17:43:29 +03:00
ElenaSubbotina	08ca56873e	RtfFormatWriter - fix shapes size (for previous)	2018-02-22 17:42:54 +03:00
ElenaSubbotina	72761a21e3	x2t fix linux build	2018-02-22 17:41:05 +03:00
ElenaSubbotina	9e5a1f004e	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop	2018-02-22 17:30:51 +03:00
ElenaSubbotina	57fea23de4	RtfFormatWriter - convert ooxml chart to ole object	2018-02-22 16:27:45 +03:00
ElenaSubbotina	bc67fc8e55	.	2018-02-21 17:36:28 +03:00
ElenaSubbotina	4aae1b21e9	RtfFormatWriter - fix write ole object	2018-02-21 17:34:16 +03:00
ElenaSubbotina	ae69f892f1	XlsFormatReader - fix users file - fix layout plot area chart from newest format	2018-02-21 15:23:46 +03:00
ElenaSubbotina	93d8634ca3	x2t fix linux compaund. version up to 2.4.518	2018-02-21 14:42:59 +03:00
ElenaSubbotina	bdd4b68f43	XlsFormat - fix users file - chart title & bevel shape	2018-02-21 12:28:48 +03:00
ElenaSubbotina	a9a674c895	RtfFormatReaderWriter - convert ole object.	2018-02-21 12:06:17 +03:00
Sergey Konovalov	ed575b3b68	[x2t][config] Rename m_oInputLimits param	2018-02-20 16:20:58 +03:00
Sergey Konovalov	016d46d030	[x2t][feat] Add m_oInput param to limit commpressed/uncommpressed size of zip	2018-02-20 14:56:20 +03:00
Sergey Konovalov	486685e4b4	[feat] Add COfficeUtils::GetFilesSize to determine commpressed/uncommpressed size of archive	2018-02-20 14:54:31 +03:00
Oleg Korshul	26a6a77b8d	[fonts] New scheme AllFontsGen	2018-02-19 19:08:52 +03:00
Oleg Korshul	90aa7973ed	[fonts] New scheme AllFontsGen	2018-02-19 17:19:29 +03:00
Oleg Korshul	b2363c02c0	[allfontsgen] Log	2018-02-16 17:01:57 +03:00
Alexey Golubev	32b59120aa	Escape building HtmlFileInternal on Mac OS	2018-02-16 12:57:06 +03:00
ElenaSubbotina	7186b56b64	DocFormatReader - fix table mapping	2018-02-16 11:54:24 +03:00
ElenaSubbotina	6247490047	RtfFormatReader - fix ole xls chart RtfFormatWriter - fix table bounds	2018-02-15 19:20:19 +03:00
Alexey Golubev	f30e14c421	Add mac support	2018-02-15 18:54:26 +03:00
Alexey Golubev	e340a2af22	Fix typo	2018-02-15 17:24:49 +03:00
Alexey Golubev	6a5cddf0ce	Add multi thread building v8 on mac	2018-02-15 17:13:05 +03:00
Alexey Golubev	312728fe9a	Fix typo	2018-02-15 17:00:44 +03:00
ElenaSubbotina	182da130da	RtfFormatWriter - fix table layouts	2018-02-14 20:01:13 +03:00
ElenaSubbotina	eb3ba8c42e	RtfFormatWriter - fix table padding	2018-02-13 19:47:23 +03:00
Sergey Konovalov	dec099b19b	[x2t] Fix bug #36922	2018-02-13 19:24:28 +03:00
ElenaSubbotina	21762360ac	RtfFormatWriter - fix linux build	2018-02-13 12:13:42 +03:00
Sergey Konovalov	563fe88842	[x2t][UnicodeConverter] Change UTF-16,UTF-32 encoding name to UTF-16LE As described in http://unicode.org/faq/utf_bom.html#gen6 UTF-16,UTF-32 requires BOM	2018-02-13 11:33:32 +03:00
ElenaSubbotina	0e085fbb13	RtfFormatWriter - fix text in ooxml shapes, expand properties ooxml shapes	2018-02-12 19:54:28 +03:00
ElenaSubbotina	ed409e745a	fix bug #36905	2018-02-12 19:44:59 +03:00
Alexey.Musinov	4bc58482b3	[ios][x2t] fixed build project	2018-02-12 14:55:08 +03:00
ElenaSubbotina	89ee039a05	RtfFormatReader - fix convert shapes	2018-02-08 11:11:49 +03:00
ElenaSubbotina	5d5b1202c7	fix for ms office editor. bug 36869.	2018-02-07 17:57:11 +03:00
Oleg Korshul	c7646fd813	Changed main default fonts	2018-02-07 17:09:40 +03:00
ElenaSubbotina	b1d406b448	fix xdr xfrm in graphiicFrame	2018-02-07 15:36:51 +03:00
ElenaSubbotina	ea37eab86e	.	2018-02-07 13:15:58 +03:00
ElenaSubbotina	d045609523	DocFormatReader - fix shape	2018-02-06 20:13:06 +03:00
Sergey Konovalov	9336448ca9	fix bug 36861	2018-02-06 17:55:37 +03:00
ElenaSubbotina	5830e7824a	fix bug #36740 - for csv preview remove error return	2018-02-06 17:35:11 +03:00
ElenaSubbotina	821feb51b5	.	2018-02-06 15:59:20 +03:00
Sergey Konovalov	547979cd9b	bug: fix open CBulletColor with no UniColor	2018-02-06 14:22:27 +03:00
ElenaSubbotina	c4481eb125	DocFormatReader - adding decrypt for format 1995, adding xor method decrypting	2018-02-06 13:55:59 +03:00
ElenaSubbotina	ad0f2c89e0	fix bug #35277 XlsFormatReader - adding decrypt for format 1995, adding xor method decrypting	2018-02-05 17:38:14 +03:00
Oleg Korshul	e15c75b6aa	add sha-256 hash agrorithm	2018-02-05 13:52:29 +03:00
ElenaSubbotina	b2fb7f0fe7	.	2018-02-05 12:52:24 +03:00
ElenaSubbotina	410e5ebd75	.	2018-02-05 12:11:35 +03:00
ElenaSubbotina	9c57088ef1	RtfFormatWriter - add application property for info OdfFormatWriter - ods - fix theme color in font	2018-02-03 18:55:49 +03:00
ElenaSubbotina	24230e12a3	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop	2018-02-02 18:26:11 +03:00
ElenaSubbotina	2acef0d4a2	.	2018-02-02 18:25:30 +03:00
Oleg Korshul	aca5ffa36f	add standard priority to "Wingdings" font-family	2018-02-02 16:58:10 +03:00
ElenaSubbotina	4fc3726f37	fix read strict ooxml textbox (namespace wne)	2018-02-02 15:08:11 +03:00
ElenaSubbotina	2682e1fbac	Ooxml - fix vml image without image	2018-02-02 14:52:15 +03:00
ElenaSubbotina	f5c3ae779b	.	2018-02-02 13:59:58 +03:00
ElenaSubbotina	068c60afa0	fix bug #36740 - extending error code x2t version 2.4.515	2018-02-01 19:33:59 +03:00
ElenaSubbotina	5b8ca5b417	OdfFormatWriter - write columns table parts in formulas as ref	2018-02-01 18:55:57 +03:00
ElenaSubbotina	acfd12ea30	fix bug #36740	2018-02-01 16:42:34 +03:00
ElenaSubbotina	a04b83cada	.	2018-02-01 12:28:46 +03:00
ElenaSubbotina	a7bf12c052	.	2018-01-31 18:17:45 +03:00
ElenaSubbotina	5c01b23dee	.	2018-01-30 20:09:22 +03:00
ElenaSubbotina	db11b75a2e	x2t version 2.4.514	2018-01-30 19:37:10 +03:00
Sergey Konovalov	2ba4c18cdf	bug: initialize m_pWorkbookComments	2018-01-30 17:22:39 +03:00
Oleg Korshul	b264f20f29	.	2018-01-30 15:21:05 +03:00
Oleg Korshul	5e04ea62f7	fix operation priority	2018-01-30 14:44:52 +03:00
Sergey Konovalov	3d1db63c0e	bug: bug on save onlyoffice extention for comments in xlsx	2018-01-29 19:51:06 +03:00
Sergey Konovalov	f124d18256	bug: save nil shading to docx	2018-01-29 18:14:23 +03:00
ElenaSubbotina	9bffb65dcb	x2t 2.4.512	2018-01-29 15:46:08 +03:00
Sergey Konovalov	2fbcc3832f	feat: add workbookComments, presentationComments	2018-01-26 20:37:27 +03:00
ElenaSubbotina	97b4311e95	.	2018-01-26 19:18:41 +03:00
ElenaSubbotina	228b3a52e9	.	2018-01-26 17:55:04 +03:00
Alexey.Musinov	2f2236646d	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop * 'develop' of https://github.com/ONLYOFFICE/core: OdfFormatReader - data validation (type dropdown list) no squares fix previous commit font by symbol table	2018-01-26 17:08:57 +03:00
Alexey.Musinov	30603d0561	build fixed	2018-01-26 17:08:51 +03:00
ElenaSubbotina	933af771b7	OdfFormatReader - data validation (type dropdown list)	2018-01-26 14:45:24 +03:00
Oleg Korshul	c04a537d69	no squares	2018-01-26 13:55:24 +03:00
Oleg Korshul	e49d78db47	fix previous commit	2018-01-26 11:39:56 +03:00
Oleg Korshul	99ec420ee5	font by symbol table	2018-01-26 11:36:19 +03:00
Oleg Korshul	f764b034a1	.	2018-01-25 18:33:12 +03:00
ElenaSubbotina	73fe023460	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop	2018-01-25 18:26:55 +03:00
ElenaSubbotina	242af3c80e	.	2018-01-25 18:26:14 +03:00
Oleg Korshul	7756e4b8bd	.	2018-01-25 18:17:46 +03:00
ElenaSubbotina	56a1d1f627	x2t -fix appVersion	2018-01-25 18:16:15 +03:00
Oleg Korshul	11bd4ff61d	.	2018-01-25 17:20:56 +03:00
ElenaSubbotina	93a06d7f86	.	2018-01-25 17:18:40 +03:00
ElenaSubbotina	76d2d429b7	x2t version 2.4.511	2018-01-25 17:07:43 +03:00
ElenaSubbotina	c6de37dbad	.	2018-01-25 17:02:31 +03:00
ElenaSubbotina	d022e669f0	.	2018-01-25 15:57:17 +03:00
ElenaSubbotina	184e79bae1	.	2018-01-25 15:52:14 +03:00
Oleg Korshul	e6581671c8	.	2018-01-25 15:27:06 +03:00
ElenaSubbotina	e0a1c688bf	.	2018-01-24 19:28:04 +03:00
ElenaSubbotina	9e0b301179	write verion x2t to converted files	2018-01-24 18:25:23 +03:00
ElenaSubbotina	8680fb2e0e	.	2018-01-24 15:45:10 +03:00
ElenaSubbotina	c7c605a970	fix bug #31327 convert script text in toggle property in simple text	2018-01-23 19:34:07 +03:00
ElenaSubbotina	23d648d92d	fix bug #36409	2018-01-23 16:53:40 +03:00
ElenaSubbotina	b098c98dbb	x2t version 2.4.510	2018-01-23 16:23:09 +03:00
ElenaSubbotina	b88726beaf	fix bug #36514	2018-01-23 14:09:55 +03:00
ElenaSubbotina	b2d3e5e194	.	2018-01-22 19:21:57 +03:00
ElenaSubbotina	a8315efae0	.	2018-01-22 18:26:40 +03:00
ElenaSubbotina	3781cf6774	.	2018-01-22 17:45:21 +03:00
ElenaSubbotina	7e36d47991	fix bug #8010 OdfFormatReader - dropdown & user fields	2018-01-22 15:09:23 +03:00
ElenaSubbotina	419a01bd09	fix bug #36725	2018-01-22 11:21:28 +03:00
ElenaSubbotina	804a01cab3	x2t version 2.4.509	2018-01-20 15:22:31 +03:00
ElenaSubbotina	931d6aa17c	.	2018-01-20 14:24:40 +03:00
ElenaSubbotina	2861539949	.	2018-01-19 19:33:12 +03:00
ElenaSubbotina	281dad68fb	.	2018-01-19 14:42:32 +03:00
ElenaSubbotina	04ba432cde	x2t version 2.4.508	2018-01-19 14:14:33 +03:00
Alexey.Musinov	61c943a3b2	up	2018-01-19 13:46:06 +03:00
ElenaSubbotina	9fdc7641b3	.	2018-01-18 15:24:33 +03:00
ElenaSubbotina	1029ee9101	OoxToBinary - modify preparing to binary write	2018-01-18 15:13:21 +03:00
Alexey.Musinov	9ef5bec2a5	[ios] fixed build	2018-01-17 12:43:03 +03:00
ElenaSubbotina	93132eb8a0	x2t version 2.4.506	2018-01-17 11:18:24 +03:00
ElenaSubbotina	9828c25e51	.	2018-01-16 19:45:34 +03:00
ElenaSubbotina	db1204288b	OdfFormatWriter - keeping current font size	2018-01-15 18:16:41 +03:00
ElenaSubbotina	26c3d37be5	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop	2018-01-15 17:57:45 +03:00
ElenaSubbotina	077ea08368	OdfFormatWriter - text position (%)	2018-01-15 17:57:32 +03:00
ElenaSubbotina	98eab74e97	.	2018-01-15 17:51:30 +03:00
Alexey Golubev	2a7e88ca76	v5.0.7	2018-01-15 15:19:37 +03:00
ElenaSubbotina	369596b860	OdfFormatWriter - fix dropCap, sections	2018-01-13 14:59:56 +03:00
ElenaSubbotina	15af8f561a	OdfFormatWriter - fix picture size from placeholder	2018-01-12 17:02:33 +03:00
ElenaSubbotina	58f8d13d71	.	2018-01-12 13:57:26 +03:00
ElenaSubbotina	d6413057e2	x2t version 2.4.505 OOXML - add external audio, video; add sound effects for shapes; fix chart theme override, clrmap; convert canvas drawingML RtfWriter - add image scaling from DrawingML fix convert from google csv	2018-01-12 12:54:22 +03:00
ElenaSubbotina	008382213b	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop Conflicts: Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.h	2018-01-12 12:13:38 +03:00
ElenaSubbotina	dd5b4a719b	x2t version 2.4.504	2018-01-12 12:03:44 +03:00
Sergey Konovalov	3d198bc211	for xlsx comments: Tahoma 9, User name in comment body	2018-01-11 20:43:10 +03:00
ElenaSubbotina	05ff75eeb2	fix bug #36652	2018-01-11 17:41:37 +03:00
Oleg Korshul	d44ef86319	.	2018-01-11 11:35:45 +03:00
Oleg Korshul	2f42dc2c35	.	2018-01-09 17:57:27 +03:00
ElenaSubbotina	597414ea6b	DocFormatFile - fix users file (1995) without codepage	2017-12-26 13:08:02 +03:00
ElenaSubbotina	7f06ce7064	.	2017-12-26 11:21:39 +03:00
ElenaSubbotina	adf39680b6	OdfFormatWriter - extendede condition conditional formatting (x14)	2017-12-25 20:06:22 +03:00
ElenaSubbotina	ce77d478e3	x2t version 2.4.498	2017-12-25 15:42:59 +03:00
ElenaSubbotina	e1e14ae243	.	2017-12-25 13:52:57 +03:00
ElenaSubbotina	4f6e364225	.	2017-12-25 13:48:50 +03:00
ElenaSubbotina	26c02c5766	.	2017-12-23 19:33:05 +03:00
ElenaSubbotina	0d8c668f95	OdfFormat, fix bug 36596 (only for onlyoffice editors)	2017-12-23 17:34:20 +03:00
ElenaSubbotina	310cff0dfe	change non-defined temp directory to unique	2017-12-23 14:48:44 +03:00
ElenaSubbotina	7f6611ab21	..	2017-12-23 14:35:52 +03:00
ElenaSubbotina	bb37e348f5	.	2017-12-23 13:26:11 +03:00
ElenaSubbotina	6b5e03df5e	.	2017-12-23 12:29:40 +03:00
Oleg Korshul	5039cec847	diagramm save error	2017-12-19 15:09:10 +03:00
Oleg Korshul	ffeb03e0d0	Merge pull request #44 from ONLYOFFICE/develop _MSC_VER >= 1900 build	2017-10-11 16:33:40 +03:00
Oleg Korshul	cf4d74a7e3	v8 6.0 windows	2017-10-11 16:24:05 +03:00
Oleg Korshul	90c0633212	.	2017-10-09 19:12:47 +03:00
Oleg Korshul	3ea4898939	.	2017-10-09 18:56:49 +03:00
Oleg Korshul	1d00c343c6	Merge pull request #43 from ONLYOFFICE/develop speed logger	2017-10-09 17:29:58 +03:00
Oleg Korshul	2a408f0e2b	.	2017-10-09 17:24:01 +03:00
Oleg Korshul	047d0567e1	mac worked version	2017-10-09 13:16:52 +03:00