PptFormatReader - fix after testing

Feature/icu60

.gitignore

@@ -20,6 +20,7 @@ Common/3dParty/v8/win_32
 Common/3dParty/v8/linux_64
 Common/3dParty/v8/linux_32
 Common/3dParty/v8/mac_64
+Common/3dParty/openssl/openssl
 **/core_build
 **/Release
 **/Debug
@@ -43,3 +44,7 @@ OfficeUtils/win32/OfficeUtilsLib/OfficeUtilsLib/ReadMe.txt
 *.pdb
 *.tlb
 *.idb
+**/.hg
+*.zip
+*.tar.gz
+**/*.build/

.travis.yml

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

ASCOfficeDocFile/Common/Aggregat.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)

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)
@@ -58,7 +58,7 @@
 
 #include <boost/format.hpp>
 
-namespace DocFormatUtils
+namespace DocFileFormat
 {
     typedef unsigned char   Bool8;
     typedef unsigned short  Bool16;
@@ -501,7 +501,7 @@ namespace DocFormatUtils
     
 			facet.widen((char*)bytes, (char*)bytes + size, &result[0]);
 			
-			for (long i=0; i < result.length(); i++)
+			for (size_t i=0; i < result.length(); i++)
 			{
 				STLCollection->push_back(result[i]);
 			}
@@ -536,7 +536,7 @@ namespace DocFormatUtils
 					delete [] pStrUtf16;
 					return GetSTLCollectionFromLocale(STLCollection, bytes,size);
 				}
-				for (long i=0; i < nLength; i++)
+				for (unsigned int i = 0; i < nLength; i++)
 				{
 					STLCollection->push_back(pStrUtf16[i]);
 				}
@@ -566,7 +566,7 @@ namespace DocFormatUtils
 					delete [] pStrUtf32;
 					return GetSTLCollectionFromLocale(STLCollection, bytes, size);
 				}
-				for (long i=0; i < nLength; i++)
+				for (unsigned int i = 0; i < nLength; i++)
 				{
 					STLCollection->push_back(pStrUtf32[i]);
 				}
@@ -652,7 +652,7 @@ namespace DocFormatUtils
 				NSUnicodeConverter::CUnicodeConverter oConverter;
 				std::wstring unicode_string = oConverter.toUnicode((char*)bytes, size, sCodePage.c_str());
 			
-				for (long i=0; i < unicode_string.size(); i++)
+				for (size_t i = 0; i < unicode_string.size(); i++)
 				{
 					STLCollection->push_back(unicode_string[i]);
 				}
@@ -963,4 +963,3 @@ namespace DocFormatUtils
 	};
 }
 
-using namespace DocFormatUtils;

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)

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)

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)

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)

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)

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)

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)

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)
@@ -393,7 +393,7 @@ namespace XMLTools
 			else
 			{
 				std::string s(m_str.begin(), m_str.end());
-				file.WriteFile((unsigned char*)s.c_str(), s.length());
+				file.WriteFile((unsigned char*)s.c_str(), (DWORD)s.length());
 			}
 			file.CloseFile();
 			return true;

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)

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)

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)
@@ -41,7 +41,7 @@ namespace DocFileFormat
 	public: 
 		AnnotationOwnerList(FileInformationBlock* fib, POLE::Stream* tableStream) : std::vector<std::wstring>()
 		{
-			VirtualStreamReader reader(tableStream, fib->m_FibWord97.fcGrpXstAtnOwners, fib->m_bOlderVersion);
+			VirtualStreamReader reader(tableStream, fib->m_FibWord97.fcGrpXstAtnOwners, fib->m_nWordVersion);
 			
 			if (fib->m_FibWord97.fcGrpXstAtnOwners > reader.GetSize()) return;
 

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)
@@ -40,7 +40,7 @@ namespace DocFileFormat
 
 		//read the user initials (LPXCharBuffer9)
 
-		if (reader->olderVersion)
+		if (reader->nWordVersion > 0)
 		{
 			short cch = reader->ReadByte();
 		
@@ -76,4 +76,4 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>(newObject);
 	}
-}
+}

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)
@@ -41,9 +41,9 @@ namespace DocFileFormat
 		static const int STRUCTURE_SIZE = 30;
 		static const int STRUCTURE_SIZE_OLD = 20;
 
-		static const int GetSize(bool bOldVersion)
+		static const int GetSize(int nWordVersion)
 		{
-			return bOldVersion ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
+			return (nWordVersion > 0) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
 		}
 
 		inline std::wstring GetUserInitials() const

ASCOfficeDocFile/DocDocxConverter/AutoSummaryInfo.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)

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)
@@ -118,70 +118,78 @@ namespace DocFileFormat
 
 	public:
 		/// Creates a new BorderCode with default values
-		BorderCode(): cv(0), dptLineWidth(0), brcType(0), ico( Global::ColorIdentifier[0] ), dptSpace(0), fShadow(false), fFrame(false), fNil(false)
+		BorderCode(): cv(0), dptLineWidth(0), brcType(0), ico( Global::ColorNameIdentifier[0] ), dptSpace(0), fShadow(false), fFrame(false), fNil(false)
 		{
 		}
 
 		/// Parses the unsigned char for a BRC
 		BorderCode( unsigned char* bytes, int size ):
-		cv(0), dptLineWidth(0), brcType(0), ico( Global::ColorIdentifier[0] ), dptSpace(0), fShadow(false), fFrame(false), fNil(false)
+		cv(0), dptLineWidth(0), brcType(0), ico( Global::ColorNameIdentifier[0] ), dptSpace(0), fShadow(false), fFrame(false), fNil(false)
 		{
 			if ( FormatUtils::ArraySum( bytes, size ) ==  ( size * 255 ) )
 			{
-				this->fNil = true;
+				fNil = true;
 			}
 			else if ( size == 8 )
 			{
 				//it's a border code of Word 2000/2003
-				this->cv = FormatUtils::BytesToInt32( bytes, 0, size );
-				this->ico = std::wstring( Global::ColorIdentifier[0] );
+				cv = FormatUtils::BytesToInt32( bytes, 0, size );
+				ico = std::wstring( Global::ColorIdentifier[0] );
 
-				this->dptLineWidth = bytes[4];
-				this->brcType = bytes[5];
+				dptLineWidth = bytes[4];
+				brcType = bytes[5];
 
 				short val = FormatUtils::BytesToInt16( bytes, 6, size );
-				this->dptSpace = val & 0x001F;
+				dptSpace = val & 0x001F;
 
 				//not sure if this is correct, the values from the spec are definitly wrong:
-				this->fShadow = FormatUtils::BitmaskToBool( val, 0x20 );
-				this->fFrame = FormatUtils::BitmaskToBool( val, 0x40 );
+				fShadow = FormatUtils::BitmaskToBool( val, 0x20 );
+				fFrame = FormatUtils::BitmaskToBool( val, 0x40 );
 			}
 			else if ( size == 4 )
 			{
-				//it's a border code of Word 97
 				unsigned short val = FormatUtils::BytesToUInt16( bytes, 0, size );
-				this->dptLineWidth = (unsigned char)( val & 0x00FF );
-				this->brcType = (unsigned char)( ( val & 0xFF00 ) >> 8 );
+
+				dptLineWidth = (unsigned char)( val & 0x00FF );
+				brcType = (unsigned char)( ( val & 0xFF00 ) >> 8 );
+
 				val = FormatUtils::BytesToUInt16( bytes, 2, size );
-				this->ico = FormatUtils::MapValueToWideString( ( val & 0x00FF ), &Global::ColorIdentifier[0][0], 17, 12 );
-				this->dptSpace = ( val & 0x1F00 ) >> 8;
+
+				ico = FormatUtils::MapValueToWideString( ( val & 0x00FF ), &Global::ColorNameIdentifier[0][0], 17, 12 );
+				dptSpace = ( val & 0x1F00 ) >> 8;
 			}
-			else
+			else if (size == 2)
 			{
-				//throw new ByteParseException("Cannot parse the struct BRC, the length of the struct doesn't match");
+				unsigned short val = FormatUtils::BytesToUInt16( bytes, 0, size );
+				
+				dptLineWidth	= GETBITS(val, 0, 2);
+				brcType			= GETBITS(val, 3, 4);
+				fShadow			= GETBIT(val, 5);
+				ico				= FormatUtils::MapValueToWideString(GETBITS(val, 6, 10), &Global::ColorNameIdentifier[0][0], 17, 12 );
+				dptSpace		= GETBITS(val, 11, 15);
+
 			}
 		}
-
 		BorderCode( const BorderCode& bc )
 		{
 			if ( this != &bc )
 			{
-				this->cv = bc.cv;
-				this->dptLineWidth = bc.dptLineWidth;
-				this->brcType = bc.brcType;
-				this->ico = bc.ico;
-				this->dptSpace = bc.dptSpace;
-				this->fShadow = bc.fShadow;
-				this->fFrame = bc.fFrame;
-				this->fNil = bc.fNil;
+				cv				= bc.cv;
+				dptLineWidth	= bc.dptLineWidth;
+				brcType			= bc.brcType;
+				ico				= bc.ico;
+				dptSpace		= bc.dptSpace;
+				fShadow			= bc.fShadow;
+				fFrame			= bc.fFrame;
+				fNil			= bc.fNil;
 			}
 		}
 
 		bool operator == ( const BorderCode& bc )
 		{
-			if ( ( this->cv == bc.cv ) && ( this->dptLineWidth == bc.dptLineWidth ) && ( this->brcType == bc.brcType ) &&
-				( this->ico == bc.ico ) && ( this->dptSpace == bc.dptSpace ) && ( this->fShadow == bc.fShadow ) &&
-				( this->fFrame == bc.fFrame ) && ( this->fNil == bc.fNil ) )
+			if ( ( cv == bc.cv ) && ( dptLineWidth == bc.dptLineWidth ) && ( brcType == bc.brcType ) &&
+				( ico == bc.ico ) && ( dptSpace == bc.dptSpace ) && ( fShadow == bc.fShadow ) &&
+				( fFrame == bc.fFrame ) && ( fNil == bc.fNil ) )
 			{
 				return true;
 			}

ASCOfficeDocFile/DocDocxConverter/ByteStructure.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)
@@ -129,355 +129,360 @@ namespace DocFileFormat
 			parent->AppendChild( *webHidden );
 			RELEASEOBJECT( webHidden );
 		}
-		std::list<SinglePropertyModifier>::iterator end = sprms->end();
-		for (std::list<SinglePropertyModifier>::iterator iter = sprms->begin(); iter != end; ++iter)
+		if ((sprms) && (!sprms->empty()))
 		{
-			int nProperty = 0; //for unknown test
-
-			switch ( (int)( iter->OpCode ) )
+			std::list<SinglePropertyModifier>::iterator end = sprms->end();
+			for (std::list<SinglePropertyModifier>::iterator iter = sprms->begin(); iter != end; ++iter)
 			{
-			case sprmOldCIstd :
-			case sprmCIstd :	//	style id 
+				int nProperty = 0; //for unknown test
+
+				switch ( (int)( iter->OpCode ) )
 				{
-					if (_isRunStyleNeeded && !_webHidden)
+				case sprmOldCIstd :
+				case sprmCIstd :	//	style id 
 					{
-						_currentIstd = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-						if (_currentIstd < _doc->Styles->Styles->size())
+						if (_isRunStyleNeeded && !_webHidden)
 						{
-                            appendValueElement( parent, L"rStyle", StyleSheetMapping::MakeStyleId( _doc->Styles->Styles->at( _currentIstd ) ), true );
+							_currentIstd = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+							if (_currentIstd < _doc->Styles->Styles->size())
+							{
+								appendValueElement( parent, L"rStyle", StyleSheetMapping::MakeStyleId( _doc->Styles->Styles->at( _currentIstd ) ), true );
+							}
+						}
+					}break;	
+
+				case sprmCFBiDi :
+					appendFlagElement( parent, *iter, L"rtl", true );
+					_isRTL = true;
+					break;
+
+				case sprmOldCFBold :
+				case sprmCFBold :
+					appendFlagElement( parent, *iter, L"b", true );
+					break;
+
+				case sprmCFBoldBi :
+					appendFlagElement( parent, *iter, L"bCs", true );
+					break;
+
+				case sprmOldCFCaps :
+				case sprmCFCaps :
+					appendFlagElement( parent, *iter, L"caps", true );
+					break;
+
+				case sprmCFComplexScripts :
+					appendFlagElement( parent, *iter, L"cs", true );
+					break;
+
+				case sprmCFDStrike :
+					appendFlagElement( parent, *iter, L"dstrike", true );
+					break;
+
+				case sprmCFEmboss :
+					appendFlagElement( parent, *iter, L"emboss", true );
+					break;
+
+				case sprmCFImprint :
+					appendFlagElement( parent, *iter, L"imprint", true );
+					break;
+
+				case sprmOldCFItalic :
+				case sprmCFItalic :
+					appendFlagElement( parent, *iter, L"i", true );
+					break;
+
+				case sprmCFItalicBi:
+					appendFlagElement( parent, *iter, L"iCs", true );
+					break;
+
+				case 0x0875:
+					appendFlagElement( parent, *iter, L"noProof", true );
+					break;
+
+				case sprmOldCFOutline:
+				case sprmCFOutline:
+					appendFlagElement( parent, *iter, L"outline", true );
+					break;
+
+				case sprmOldCFShadow:
+				case sprmCFShadow:
+					appendFlagElement( parent, *iter, L"shadow", true );
+					break;
+
+				case sprmOldCFSmallCaps:
+				case sprmCFSmallCaps:
+					appendFlagElement( parent, *iter, L"smallCaps", true );
+					break;
+
+				case sprmCFSpecVanish:
+					appendFlagElement( parent, *iter, L"specVanish", true );
+					break;
+
+				case sprmOldCFStrike:
+				case sprmCFStrike:
+					appendFlagElement( parent, *iter, L"strike", true );
+					break;
+
+				case sprmOldCFVanish:
+				case sprmCFVanish:
+					appendFlagElement( parent, *iter, L"vanish", true );
+					break;
+
+				case 0x0811:
+					appendFlagElement( parent, *iter, L"webHidden", true );
+					break;
+
+				case sprmOldCIss:
+				case sprmCIss:
+					if (iter->argumentsSize > 0 && iter->Arguments[0] < 3)	//Metaevan.doc
+						appendValueElement( parent, L"vertAlign", FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ), true );
+					break;	
+
+				case sprmCRgLid0_80:
+				case sprmCRgLid0:
+					{	//latin					
+						LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
+
+						LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, Default );
+
+						langid.Convert( langIDMapping );
+
+						RELEASEOBJECT( langIDMapping );
+					}break;	
+
+				case sprmOldCLid:
+				case sprmCRgLid1_80:
+				case sprmCRgLid1:
+					{	//east asia				
+						LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
+
+						LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, EastAsian );
+
+						langid.Convert( langIDMapping );
+
+						RELEASEOBJECT( langIDMapping );
+					}break;
+
+				case sprmCLidBi:
+					{					
+						LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
+
+						LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, Complex );
+
+						langid.Convert( langIDMapping );
+
+						RELEASEOBJECT( langIDMapping );
+					}break;	
+
+				case sprmCBrc80:
+				case sprmCBrc:
+					{  //borders
+						XMLTools::XMLElement bdr( L"w:bdr" );
+						BorderCode bc( iter->Arguments, iter->argumentsSize );
+						appendBorderAttributes( &bc, &bdr );
+						parent->AppendChild( bdr );
+					}break;		
+
+				case sprmCShd80:
+				case sprmCShd:
+					{  //shading
+						ShadingDescriptor desc( iter->Arguments, iter->argumentsSize );
+
+						appendShading( parent, desc );
+					}break;		
+
+				case sprmOldCIco:
+				case sprmCIco:
+				case sprmCIcoBi:
+					{//color
+						colorVal->SetValue( FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ));
+					}break;
+
+				case sprmCCv:
+					{
+						std::wstringstream sstream;
+
+						sstream << boost::wformat(L"%02x%02x%02x") % iter->Arguments[0] % /*G*/iter->Arguments[1] % /*B*/iter->Arguments[2];
+						colorVal->SetValue(sstream.str());
+					}break;	
+
+				case sprmCOldHighlight:
+					{
+						appendValueElement( parent, L"highlight", FormatUtils::MapValueToWideString( iter->Arguments[1], &Global::ColorNameIdentifier[0][0], 17, 12 ), true );
+					}break;	
+				case sprmCHighlight:
+					{
+						appendValueElement( parent, L"highlight", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorNameIdentifier[0][0], 17, 12 ), true );
+					}break;	
+
+				case sprmOldCDxaSpace:
+				case sprmCDxaSpace:
+					{
+						appendValueElement( parent, L"spacing", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
+					}break;
+
+				case sprmCFtcBi :
+					{//default from FontTable
+						size_t nIndex	=	FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize);
+						if( nIndex < _doc->FontTable->Data.size() )
+						{
+							FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
+							if (ffn)
+								m_sDefaultFont = ffn->xszFtn;
+						}
+					}break;
+
+				case sprmCHpsBi :
+					{
+						appendValueElement( parent, L"szCs",
+							FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );						
+					}
+					break;
+	// Font Size in points (2~3276) default 20-half-points
+				case sprmOldCHps :
+					{
+						appendValueElement (parent, L"sz",
+							FormatUtils::IntToWideString (FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize) ),
+							true );
+					}break;
+				case sprmCHps : 
+					{  
+						appendValueElement (parent, L"sz",
+							FormatUtils::IntToWideString (FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize) ), true );						
+					}break;
+
+				case sprmCMajority :
+					{	//for complex props
+					}break;
+
+				case sprmOldCHpsPos: 
+					{	// The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168)
+						short nVertPos = FormatUtils::BytesToUChar(iter->Arguments, 0, iter->argumentsSize);
+						appendValueElement (parent, L"position", nVertPos, true);
+					}break;
+				case sprmCHpsPos: 
+					{	// The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168)
+						short nVertPos = FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize);
+						appendValueElement (parent, L"position", nVertPos, true);
+					}break;
+
+				case sprmOldCHpsKern:
+				case sprmCHpsKern:
+					{
+						appendValueElement( parent, L"kern", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
+					}break;
+
+				case sprmOldCFtc:
+				case sprmCRgFtc0:
+					{	// font family
+						size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+						
+						if( nIndex < _doc->FontTable->Data.size() )
+						{
+							XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( L"w:ascii" );
+							FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
+							m_sAsciiFont = ffn->xszFtn;
+							ascii->SetValue( FormatUtils::XmlEncode(m_sAsciiFont, true));
+							rFonts->AppendAttribute( *ascii );
+							RELEASEOBJECT( ascii );
+						}
+					}break;
+
+				case sprmCRgFtc1:
+					{
+						size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+
+						if( nIndex >= 0 && nIndex < _doc->FontTable->Data.size() )
+						{
+							XMLTools::XMLAttribute* eastAsia = new XMLTools::XMLAttribute( L"w:eastAsia" );
+							FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
+							m_sEastAsiaFont = ffn->xszFtn;
+							eastAsia->SetValue( FormatUtils::XmlEncode(m_sEastAsiaFont));
+							rFonts->AppendAttribute( *eastAsia );
+							RELEASEOBJECT( eastAsia );
 						}
 					}
-				}break;	
+					break;
 
-			case sprmCFBiDi :
-                appendFlagElement( parent, *iter, L"rtl", true );
-				_isRTL = true;
-				break;
-
-			case sprmOldCFBold :
-			case sprmCFBold :
-                appendFlagElement( parent, *iter, L"b", true );
-				break;
-
-			case sprmCFBoldBi :
-                appendFlagElement( parent, *iter, L"bCs", true );
-				break;
-
-			case sprmOldCFCaps :
-			case sprmCFCaps :
-                appendFlagElement( parent, *iter, L"caps", true );
-				break;
-
-			case sprmCFComplexScripts :
-                appendFlagElement( parent, *iter, L"cs", true );
-				break;
-
-			case sprmCFDStrike :
-                appendFlagElement( parent, *iter, L"dstrike", true );
-				break;
-
-			case sprmCFEmboss :
-                appendFlagElement( parent, *iter, L"emboss", true );
-				break;
-
-			case sprmCFImprint :
-                appendFlagElement( parent, *iter, L"imprint", true );
-				break;
-
-			case sprmOldCFItalic :
-			case sprmCFItalic :
-                appendFlagElement( parent, *iter, L"i", true );
-				break;
-
-			case sprmCFItalicBi:
-                appendFlagElement( parent, *iter, L"iCs", true );
-				break;
-
-			case 0x0875:
-                appendFlagElement( parent, *iter, L"noProof", true );
-				break;
-
-			case sprmOldCFOutline:
-			case sprmCFOutline:
-                appendFlagElement( parent, *iter, L"outline", true );
-				break;
-
-			case sprmOldCFShadow:
-			case sprmCFShadow:
-                appendFlagElement( parent, *iter, L"shadow", true );
-				break;
-
-			case sprmOldCFSmallCaps:
-			case sprmCFSmallCaps:
-                appendFlagElement( parent, *iter, L"smallCaps", true );
-				break;
-
-			case sprmCFSpecVanish:
-                appendFlagElement( parent, *iter, L"specVanish", true );
-				break;
-
-			case sprmOldCFStrike:
-			case sprmCFStrike:
-                appendFlagElement( parent, *iter, L"strike", true );
-				break;
-
-			case sprmOldCFVanish:
-			case sprmCFVanish:
-                appendFlagElement( parent, *iter, L"vanish", true );
-				break;
-
-			case 0x0811:
-                appendFlagElement( parent, *iter, L"webHidden", true );
-				break;
-
-			case sprmOldCIss:
-			case sprmCIss:
-				if (iter->argumentsSize > 0 && iter->Arguments[0] < 3)	//Metaevan.doc
-					appendValueElement( parent, L"vertAlign", FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ), true );
-				break;	
-
-			case sprmCRgLid0_80:
-			case sprmCRgLid0:
-				{	//latin					
-					LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-
-					LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, Default );
-
-					langid.Convert( langIDMapping );
-
-					RELEASEOBJECT( langIDMapping );
-				}break;	
-
-			case sprmOldCLid:
-			case sprmCRgLid1_80:
-			case sprmCRgLid1:
-				{	//east asia				
-					LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-
-					LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, EastAsian );
-
-					langid.Convert( langIDMapping );
-
-					RELEASEOBJECT( langIDMapping );
-				}break;
-
-			case sprmCLidBi:
-				{					
-					LanguageId langid( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-
-					LanguageIdMapping* langIDMapping = new LanguageIdMapping( lang, Complex );
-
-					langid.Convert( langIDMapping );
-
-					RELEASEOBJECT( langIDMapping );
-				}break;	
-
-			case sprmCBrc80:
-			case sprmCBrc:
-				{  //borders
-                    XMLTools::XMLElement bdr( L"w:bdr" );
-					BorderCode bc( iter->Arguments, iter->argumentsSize );
-					appendBorderAttributes( &bc, &bdr );
-					parent->AppendChild( bdr );
-				}break;		
-
-			case sprmCShd80:
-			case sprmCShd:
-				{  //shading
-					ShadingDescriptor desc( iter->Arguments, iter->argumentsSize );
-
-					appendShading( parent, desc );
-				}break;		
-
-			case sprmOldCIco:
-			case sprmCIco:
-			case sprmCIcoBi:
-				{//color
-					colorVal->SetValue( FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ));
-				}break;
-
-			case sprmCCv:
-				{
-					std::wstringstream sstream;
-
-					sstream << boost::wformat(L"%02x%02x%02x") % iter->Arguments[0] % /*G*/iter->Arguments[1] % /*B*/iter->Arguments[2];
-                    colorVal->SetValue(sstream.str());
-				}break;	
-
-			case sprmCOldHighlight:
-				{
-                    appendValueElement( parent, L"highlight", FormatUtils::MapValueToWideString( iter->Arguments[1], &Global::ColorIdentifier[0][0], 17, 12 ), true );
-				}break;	
-			case sprmCHighlight:
-				{
-                    appendValueElement( parent, L"highlight", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ), true );
-				}break;	
-
-			case sprmOldCDxaSpace:
-			case sprmCDxaSpace:
-				{
-                    appendValueElement( parent, L"spacing", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
-				}break;
-
-			case sprmCFtcBi :
-				{//default from FontTable
-					SHORT nIndex	=	FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize);
-					if( nIndex < _doc->FontTable->Data.size() )
+				case sprmCRgFtc2:
 					{
-						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
-						if (ffn)
-							m_sDefaultFont = ffn->xszFtn;
-					}
-				}break;
+						size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
 
-			case sprmCHpsBi :
-				{
-                    appendValueElement( parent, L"szCs",
-						FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );						
-				}
-				break;
-// Font Size in points (2~3276) default 20-half-points
-			case sprmOldCHps :
-				{
-                    appendValueElement (parent, L"sz",
-						FormatUtils::IntToWideString (FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize) ),
-						true );
-				}break;
-			case sprmCHps : 
-				{  
-                    appendValueElement (parent, L"sz",
-						FormatUtils::IntToWideString (FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize) ), true );						
-				}break;
-
-			case sprmCMajority :
-				{	//for complex props
-				}break;
-
-			case sprmOldCHpsPos: 
-				{	// The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168)
-					short nVertPos = FormatUtils::BytesToUChar(iter->Arguments, 0, iter->argumentsSize);
-                    appendValueElement (parent, L"position", nVertPos, true);
-				}break;
-			case sprmCHpsPos: 
-				{	// The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168)
-					short nVertPos = FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize);
-                    appendValueElement (parent, L"position", nVertPos, true);
-				}break;
-
-			case sprmOldCHpsKern:
-			case sprmCHpsKern:
-				{
-                    appendValueElement( parent, L"kern", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
-				}break;
-
-			case sprmOldCFtc:
-			case sprmCRgFtc0:
-				{	// font family
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-					
-					if( nIndex < _doc->FontTable->Data.size() )
-					{
-                        XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( L"w:ascii" );
-						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
-						m_sAsciiFont = ffn->xszFtn;
-						ascii->SetValue( FormatUtils::XmlEncode(m_sAsciiFont, true));
-						rFonts->AppendAttribute( *ascii );
-						RELEASEOBJECT( ascii );
-					}
-				}break;
-
-			case sprmCRgFtc1:
-				{
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-					if( nIndex >= 0 && nIndex < _doc->FontTable->Data.size() )
-					{
-                        XMLTools::XMLAttribute* eastAsia = new XMLTools::XMLAttribute( L"w:eastAsia" );
-						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
-						m_sEastAsiaFont = ffn->xszFtn;
-						eastAsia->SetValue( FormatUtils::XmlEncode(m_sEastAsiaFont));
-						rFonts->AppendAttribute( *eastAsia );
-						RELEASEOBJECT( eastAsia );
-					}
-				}
-				break;
-
-			case sprmCRgFtc2:
-				{
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-					if( nIndex>=0 && nIndex < _doc->FontTable->Data.size() )
-					{
-                        XMLTools::XMLAttribute* ansi = new XMLTools::XMLAttribute( L"w:hAnsi" );
-						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
-						m_shAnsiFont = ffn->xszFtn;
-						ansi->SetValue( FormatUtils::XmlEncode(m_shAnsiFont));
-						rFonts->AppendAttribute( *ansi );
-						RELEASEOBJECT( ansi );
-					}
-				}break;			
-
-			case sprmOldCKul:
-			case sprmCKul:
-				{	//Underlining
-                    appendValueElement( parent, L"u", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::UnderlineCode[0][0], 56, 16 ), true );
-				}
-				break;		
-
-			case sprmCCharScale:
-				{	//char width
-                    appendValueElement( parent, L"w", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
-				}break;	
-							
-			case sprmCSfxText:
-				{	//animation
-                    appendValueElement( parent, L"effect", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextAnimation[0][0], 7, 16 ), true );
-				}break;	
-
-			case sprmCIdctHint:
-				{
-					switch(iter->Arguments[0])
-					{
-					case 0:		break;	// default
-					case 1:		break;	// eastAsia
-					case 2:		break;	// cs
-					case 0xFF:	break;	//No ST_Hint equivalent
-					}
-
-				}break;
-
-			case sprmCPbiIBullet:
-				{
-					int nIndex = FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize );
-					if (nIndex >=0)
-					{
-						std::map<int, int>::iterator it = _doc->PictureBulletsCPsMap.find(nIndex);
-						if (it != _doc->PictureBulletsCPsMap.end())
+						if( nIndex>=0 && nIndex < _doc->FontTable->Data.size() )
 						{
-							//добавить
+							XMLTools::XMLAttribute* ansi = new XMLTools::XMLAttribute( L"w:hAnsi" );
+							FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
+							m_shAnsiFont = ffn->xszFtn;
+							ansi->SetValue( FormatUtils::XmlEncode(m_shAnsiFont));
+							rFonts->AppendAttribute( *ansi );
+							RELEASEOBJECT( ansi );
 						}
+					}break;			
+
+				case sprmOldCKul:
+				case sprmCKul:
+					{	//Underlining
+						appendValueElement( parent, L"u", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::UnderlineCode[0][0], 56, 16 ), true );
 					}
-				}break;
+					break;		
 
-			case sprmCPbiGrf:
-				{
-					//used picture bullet
-					int val = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+				case sprmCCharScale:
+					{	//char width
+						appendValueElement( parent, L"w", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
+					}break;	
+								
+				case sprmCSfxText:
+					{	//animation
+						appendValueElement( parent, L"effect", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextAnimation[0][0], 7, 16 ), true );
+					}break;	
 
-				}break;
+				case sprmCIdctHint:
+					{
+						switch(iter->Arguments[0])
+						{
+						case 0:		break;	// default
+						case 1:		break;	// eastAsia
+						case 2:		break;	// cs
+						case 0xFF:	break;	//No ST_Hint equivalent
+						}
 
-			case sprmCRsidProp:
-			case sprmCRsidText:
-				break;
+					}break;
 
-			default:
-				if (iter->argumentsSize == 2)
-				{
-					nProperty = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-				}else
-					if (iter->argumentsSize == 1)
-				{
-					nProperty = FormatUtils::BytesToUChar( iter->Arguments, 0, iter->argumentsSize );
+				case sprmCPbiIBullet:
+					{
+						int nIndex = FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize );
+						if (nIndex >=0)
+						{
+							std::map<int, int>::iterator it = _doc->PictureBulletsCPsMap.find(nIndex);
+							if (it != _doc->PictureBulletsCPsMap.end())
+							{
+								//добавить
+							}
+						}
+					}break;
+
+				case sprmCPbiGrf:
+					{
+						//used picture bullet
+						int val = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+
+					}break;
+
+				case sprmCRsidProp:
+				case sprmCRsidText:
+					break;
+
+				default:
+					if (iter->argumentsSize == 2)
+					{
+						nProperty = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+					}else
+						if (iter->argumentsSize == 1)
+					{
+						nProperty = FormatUtils::BytesToUChar( iter->Arguments, 0, iter->argumentsSize );
+					}
+					break;
 				}
-				break;
 			}
 		}
 

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)

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

ASCOfficeDocFile/DocDocxConverter/CharacterRange.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)
@@ -68,12 +68,12 @@ namespace DocFileFormat
 				int cp = m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr;
 
 				size_t count = m_document->AnnotationsReferencePlex->Elements.size();
-				for (unsigned int i = 0; i < count; ++i)
+				for (size_t i = 0; i < count; ++i)
 				{   
 					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
 
                     m_pXmlWriter->WriteNodeBegin( L"w:comment", TRUE );
-                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index ));
+                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 ));
                     m_pXmlWriter->WriteAttribute( L"w:author",
 						FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->GetAuthorIndex() ) ));
                     m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->GetUserInitials());
@@ -95,7 +95,7 @@ namespace DocFileFormat
 						if (fc < 0) break;
 
 						ParagraphPropertyExceptions* papx = findValidPapx(fc);
-						TableInfo tai(papx);
+						TableInfo tai(papx, m_document->nWordVersion);
 
 						if ( tai.fInTable )
 						{
@@ -107,7 +107,7 @@ namespace DocFileFormat
 						else
 						{
 							//this PAPX is for a normal paragraph
-							cp = writeParagraph(cp);
+							cp = writeParagraph(cp, 0x7fffffff);
 						}
 					}
 

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";
@@ -157,6 +162,7 @@ namespace OpenXmlRelationshipTypes
     static const wchar_t* OleObject				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
     static const wchar_t* GlossaryDocument		=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument";
     static const wchar_t* Package				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
+    static const wchar_t* VbaProject			=	L"http://schemas.microsoft.com/office/2006/relationships/vbaProject";
 }
 
 namespace MicrosoftWordRelationshipTypes

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;
 	};
 }

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,9 +63,17 @@ namespace DocFileFormat
 {
 	long Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
 	{
+		if (!doc || !docx) return S_FALSE;
+		
 		ConversionContext context( doc, docx );
 
-		//Write styles.xml
+	//Write fontTable.xml
+		if (doc->FontTable)
+		{
+			FontTableMapping fontTableMapping( &context );
+			doc->FontTable->Convert( &fontTableMapping );
+		}
+	//Write styles.xml
 		if (doc->Styles)
 		{
 			StyleSheetMapping styleSheetMapping( &context );
@@ -88,9 +96,7 @@ namespace DocFileFormat
 				return S_FALSE;
 			}
 		}
-
-
-		//Write numbering.xml
+	//Write numbering.xml
 		if (doc->listTable)
 		{
 			NumberingMapping numberingMapping( &context );
@@ -109,14 +115,6 @@ namespace DocFileFormat
 				return S_FALSE;
 			}
 		}
-
-		//Write fontTable.xml
-		if (doc->FontTable)
-		{
-			FontTableMapping fontTableMapping( &context );
-			doc->FontTable->Convert( &fontTableMapping );
-		}
-
 		if ( progress != NULL )
 		{
 			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 875000 );
@@ -130,7 +128,7 @@ namespace DocFileFormat
 			}
 		}
 
-		//write the footnotes
+	//write the footnotes
 		FootnotesMapping footnotesMapping( &context );
 		doc->Convert( &footnotesMapping );
 
@@ -147,7 +145,7 @@ namespace DocFileFormat
 			}
 		}
 
-		//write the endnotes
+	//write the endnotes
 		EndnotesMapping endnotesMapping( &context );
 		doc->Convert( &endnotesMapping );
 
@@ -164,7 +162,7 @@ namespace DocFileFormat
 			}
 		}
 
-		//write the comments
+	//write the comments
 		CommentsMapping commentsMapping( &context );
 		doc->Convert( &commentsMapping );
 
@@ -181,13 +179,13 @@ namespace DocFileFormat
 			}
 		}
 
-		//write settings.xml at last because of the rsid list
+	//write settings.xml at last because of the rsid list
 		if (doc->DocProperties)
 		{
 			SettingsMapping settingsMapping( &context );
 			doc->DocProperties->Convert( &settingsMapping );
 		}
-
+		
 		if ( progress != NULL )
 		{
 			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 975000 );
@@ -204,7 +202,7 @@ namespace DocFileFormat
 		return S_OK;
 	}
 
-	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress)
+	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
 	{
         long result = S_FALSE;
 
@@ -219,7 +217,7 @@ namespace DocFileFormat
 
             if (result == S_OK)
 			{
-				docx.SaveDocument();
+				docx.SaveDocument(bMacros);
 
                 if (progress)progress->OnProgress(progress->caller, DOC_ONPROGRESSEVENT_ID, 1000000);
 

ASCOfficeDocFile/DocDocxConverter/Converter.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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,7 @@ namespace DocFileFormat
 
 		std::wstring m_sTempFolder;
 
-		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress);
+		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
 	
 	private:
 		long Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	

ASCOfficeDocFile/DocDocxConverter/DateAndTime.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)
@@ -59,29 +59,30 @@ namespace DocFileFormat
       short wdy;
 
     public:
-      /// Creates a new DateAndTime with default values
-      DateAndTime()
-      {
-        setDefaultValues();
-      }
-
-      /// Parses the unsigned char sto retrieve a DateAndTime
-      DateAndTime( unsigned char* bytes, int size )
-      {
-        if ( size == 4 )
-        {
-          this->mint    = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 0, 6 );
-          this->hr      = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 6, 5 );
-          this->dom     = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 11, 5 );
-          this->mon     = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 16, 4 );
-          this->yr      = (short)( 1900 + FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 20, 9 ) );
-          this->wdy     = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 29, 3 );
-        }
-        else
-        {
-          //throw new ByteParseException("Cannot parse the struct DTTM, the length of the struct doesn't match");
-        }
-      }
+		DateAndTime()
+		{
+			setDefaultValues();
+		}
+		DateAndTime( unsigned int val )
+		{
+			DateAndTime((unsigned char*)&val, 4);
+		}
+		DateAndTime( unsigned char* bytes, int size )
+		{
+			if ( size == 4 )
+			{
+			  this->mint    = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 0, 6 );
+			  this->hr      = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 6, 5 );
+			  this->dom     = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 11, 5 );
+			  this->mon     = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 16, 4 );
+			  this->yr      = (short)( 1900 + FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 20, 9 ) );
+			  this->wdy     = (short)FormatUtils::GetIntFromBits( FormatUtils::BytesToInt32( bytes, 0, size ), 29, 3 );
+			}
+			else
+			{
+			  //throw new ByteParseException("Cannot parse the struct DTTM, the length of the struct doesn't match");
+			}
+		}
 #if defined(_WIN32) || defined(_WIN64)
 	  SYSTEMTIME ToSYSTEMTIME()
       {

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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,6 +48,8 @@
 #include "OleObjectMapping.h"
 #include "ConversionContext.h"
 #include "IMapping.h"
+#include "FormFieldData.h"
+#include "FormFieldDataMapping.h"
 
 namespace DocFileFormat
 {
@@ -85,7 +87,7 @@ namespace DocFileFormat
 		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 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 );
@@ -99,28 +101,33 @@ namespace DocFileFormat
         void writeTextStart		( const std::wstring& textType, bool preserve_space);
 		void writeTextEnd		( const std::wstring& textType );
 		
-	// Searches for bookmarks in the list of characters.
 		std::vector<int> searchBookmarks( std::vector<wchar_t>* chars, int initialCp );
+		std::vector<int> searchAnnot(std::vector<wchar_t>* chars, int initialCp);
+
 		ParagraphPropertyExceptions* findValidPapx( int fc );
 	// Splits a list of characters into several lists
 		std::list<std::vector<wchar_t> >* splitCharList( std::vector<wchar_t>* chars, std::vector<int>* splitIndices );
 	// Writes the table starts at the given cp value
 		int writeTable		( int initialCp, unsigned int nestingLevel );
 	// Builds a list that contains the width of the several columns of the table.
-		std::vector<short>* buildTableGrid( int initialCp, unsigned int nestingLevel );
+		bool buildTableGrid( int initialCp, unsigned int nestingLevel, std::vector<short>& grid, std::vector<short>& grid_write );
 	// Finds the FC of the next row end mark.
 		int findRowEndFc		( int initialCp, int& rowEndCp, unsigned int nestingLevel );
 	// Finds the FC of the next row end mark.
 		int findRowEndFc		( int initialCp, unsigned int nestingLevel );
 	// Writes the table row that starts at the given cp value and ends at the next row end mark
-		int writeTableRow		( int initialCp, std::vector<short>* grid, unsigned int nestingLevel );
+		int writeTableRow		( int initialCp, std::vector<short>* grid, std::vector<short>* grid_write, unsigned int nestingLevel );
 	// Writes the table cell that starts at the given cp value and ends at the next cell end mark
-		int writeTableCell		( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel );
+		int writeTableCell		( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, std::vector<short>* grid_write, int& gridIndex, int cellIndex, unsigned int nestingLevel );
 		int findCellEndCp		( int initialCp, unsigned int nestingLevel );
 		
 		bool writeBookmarks		( int cp );
 		bool writeBookmarkStart	( short id );
 		bool writeBookmarkEnd	( short id );
+
+		bool writeAnnotations	( int cp );
+		bool writeAnnotationStart( short id );
+		bool writeAnnotationEnd	( short id );
 	// Checks if the CHPX is special
 		bool isSpecial( CharacterPropertyExceptions* chpx );
 	// Finds the SEPX that is valid for the given CP.
@@ -147,11 +154,19 @@ namespace DocFileFormat
 		int								_commentNr;
 		bool							_isTextBoxContent;
 		int								_isSectionPageBreak; //0 - not set, 1 -page break, 2 - continues
-		bool							_writeInstrText;
 		bool							_writeWebHidden;
-		unsigned int					_fldCharCounter;
 		std::wstring					_writeAfterRun;
 		std::wstring					_lastOLEObject;
 		int								_cacheListNum;
+		
+		struct fieldLevels
+		{
+			bool bBegin = false;
+			bool bSeparate = false;
+			//bool bInstrText = false;
+			bool bEnd = false;
+		};
+		std::vector<fieldLevels>		_fieldLevels;
+		bool							_bContentWrite;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/DocumentProperties.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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,22 +48,89 @@ namespace DocFileFormat
 	{
 		Initialize();
 		
-		VirtualStreamReader tStream( tableStream, fib->m_FibWord97.fcDop, fib->m_bOlderVersion);
+		VirtualStreamReader tStream( tableStream, fib->m_FibWord97.fcDop, fib->m_nWordVersion);
 		
 //setDefaultCompatibilityOptions( fib->m_FibBase.nFib );
 
-		unsigned int size		= fib->m_FibWord97.lcbDop;
-		unsigned char* bytes	= tStream.ReadBytes( size, true );
+		unsigned int size = fib->m_FibWord97.lcbDop;
+		unsigned char* bytes = NULL;
 
         try
         {
-            if ( size > 0 )
+			if (fib->m_nWordVersion == 2)	
+			{
+				unsigned char* Temp = tStream.ReadBytes(size, true);
+				tStream.Seek(fib->m_FibWord97.fcDop, 0);
+				delete []Temp;
+
+				unsigned char flags1 = tStream.ReadByte();
+				
+				fFacingPages	= GETBIT(flags1, 0);
+				fWindowControl	= GETBIT(flags1, 1);
+				Fpc				= GETBITS(flags1, 5, 6);
+				bool fWide		= GETBIT(flags1, 7);
+				
+				grpfIhdt		= tStream.ReadByte();
+				
+				unsigned short flags2 = tStream.ReadUInt16();
+				rncFtn			= GETBIT(flags2, 0);
+				nFtn			= GETBITS(flags2, 1, 15);
+
+				unsigned char irmBar	= tStream.ReadByte();
+
+				unsigned char flags3	= tStream.ReadByte();
+				unsigned char irmProps	= GETBITS(flags3, 0, 6);
+				fRevMarking				= GETBIT(flags3, 7);
+				
+				unsigned short flags4 = tStream.ReadUInt16();
+				fBackup			= GETBIT(flags4, 0);
+				fExactWords		= GETBIT(flags4, 1);
+				fPagHidden		= GETBIT(flags4, 2);
+				fPagResults		= GETBIT(flags4, 3);
+				fLockAtn		= GETBIT(flags4, 4);
+				fMirrorMargins	= GETBIT(flags4, 5);
+				bool fKeepFileFormat	= GETBIT(flags4, 6);
+				fDflttrueType	= GETBIT(flags4, 7);
+
+				fPagSuppressTopSpacing	= GETBIT(flags4, 8);
+				fMaybeRTLTables			= GETBIT(flags4, 9);
+
+				bool fSpares = tStream.ReadUInt16();
+				dxaTab = tStream.ReadUInt16();
+
+				wSpare = tStream.ReadUInt16();//ftcDefaultBi
+				dxaHotZ = tStream.ReadUInt16();
+
+				wSpare2 = tStream.ReadUInt16();
+				wSpare3 = tStream.ReadUInt16();
+				
+                dttmCreated = DateAndTime( tStream.ReadUInt32() );
+				dttmRevised = DateAndTime( tStream.ReadUInt32() );
+				dttmLastPrint = DateAndTime( tStream.ReadUInt32() );
+				
+				nRevision = tStream.ReadUInt16();
+				tmEdited = tStream.ReadUInt32();
+
+				cWords = tStream.ReadUInt32();
+				cCh = tStream.ReadUInt32();
+				cPg = tStream.ReadUInt16();
+
+				unsigned short rgwSpareDocSum[2];
+				rgwSpareDocSum[0] = tStream.ReadUInt16();
+				rgwSpareDocSum[1] = tStream.ReadUInt16();
+
+			}
+            else if ( size > 0 )
             {
-                fFacingPages	= FormatUtils::GetBitFromBytes( bytes, 2, 0 );
+				bytes	= tStream.ReadBytes( size, true );
+               
+				fFacingPages	= FormatUtils::GetBitFromBytes( bytes, 2, 0 );
                 fWindowControl	= FormatUtils::GetBitFromBytes( bytes, 2, 1 );
                 fPMHMainDoc		= FormatUtils::GetBitFromBytes( bytes, 2, 2 );
                 grfSuppression	= (short)FormatUtils::GetUIntFromBytesBits( bytes, 2, 3, 2 );
-                Fpc				= (short)(short)FormatUtils::GetUIntFromBytesBits( bytes, 2, 5, 2 );
+                Fpc				= (short)FormatUtils::GetUIntFromBytesBits( bytes, 2, 5, 2 );
+
+				grpfIhdt		= FormatUtils::BytesToUChar( bytes, 1, size );
 
                 rncFtn			= (short)FormatUtils::GetUIntFromBytesBits( ( bytes + 2 ), 2, 0, 2 );
                 nFtn			= (short)FormatUtils::GetUIntFromBytesBits( ( bytes + 2 ), 2, 2, 14 );
@@ -545,6 +612,7 @@ namespace DocFileFormat
       fSwapBordersFacingPgs = false;
       dxaTab = 0;
       wSpare = 0;
+	  wSpare3 = 0;
       dxaHotZ = 0;
       cConsecHypLim = 0;
       wSpare2 = 0;

ASCOfficeDocFile/DocDocxConverter/DocumentProperties.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)
@@ -177,7 +177,8 @@ namespace DocFileFormat
 		unsigned short cConsecHypLim;
         // Reserved
 		unsigned short wSpare2;
-        // Date and time document was created
+ 		unsigned short wSpare3;
+       // Date and time document was created
 		DateAndTime dttmCreated;
         // Date and time document was last revised
 		DateAndTime dttmRevised;

ASCOfficeDocFile/DocDocxConverter/DocumentTypographyInfo.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)

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)
@@ -33,7 +33,6 @@
 #include "DrawingPrimitives.h"
 #include "VirtualStreamReader.h"
 
-
 namespace DocFileFormat
 {
 	DrawingPrimitive * DrawingPrimitive::Create(VirtualStreamReader* reader, int length, short dpk)

ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)

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

ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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;
 	};
 }

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)

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)
@@ -79,7 +79,7 @@ namespace DocFileFormat
 						if (fc < 0) break;
 
 						ParagraphPropertyExceptions* papx = findValidPapx( fc );
-						TableInfo tai( papx );
+						TableInfo tai( papx, m_document->nWordVersion );
 
 						if ( tai.fInTable )
 						{
@@ -91,7 +91,7 @@ namespace DocFileFormat
 						else
 						{
 							//this PAPX is for a normal paragraph
-							cp = writeParagraph( cp );
+							cp = writeParagraph( cp, 0x7fffffff );
 						}
 					}
 

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)

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)

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)
@@ -69,14 +69,22 @@ namespace DocFileFormat
 		newObject->prq			= (unsigned char)	FormatUtils::BitmaskToInt	( ffid, 0x03 );
 		newObject->fTrueType	=					FormatUtils::BitmaskToBool	( ffid, 0x04 );
 		newObject->ff			= (unsigned char)	FormatUtils::BitmaskToInt	( ffid, 0x70 );
-		newObject->wWeight		= reader->ReadInt16();
-		newObject->chs			= reader->ReadByte();
 
 		//int sz_fonts = 150; //..  нужно генерить уникальное todooo
+		int szAlt = 0;
+		if (reader->nWordVersion == 2)
+		{
+			newObject->wWeight = reader->ReadByte();
+		}
+		else
+		{
+			newObject->wWeight		= reader->ReadInt16();
+			newObject->chs			= reader->ReadByte();
 		
-		int szAlt = reader->ReadByte();
+			szAlt = reader->ReadByte();
+		}
 
-		if (!reader->olderVersion)
+		if (reader->nWordVersion == 0)
 		{
 			//read the 10 bytes panose
 			newObject->panoseSize = 10;
@@ -97,7 +105,7 @@ namespace DocFileFormat
 
 		unsigned char *bytes = reader->ReadBytes( (int)( strEnd - strStart ), true );
 
-		if (reader->olderVersion)
+		if (reader->nWordVersion > 0)
 		{
 			FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &(newObject->xszFtn), bytes, (int)( strEnd - strStart ), ENCODING_WINDOWS_1250 );
 		}
@@ -131,7 +139,7 @@ namespace DocFileFormat
 
 			bytes = reader->ReadBytes( (int)( strEnd - strStart ), true );
 
-			if (reader->olderVersion)
+			if (reader->nWordVersion > 0)
 			{
 				FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &(newObject->xszAlt), bytes, (int)( strEnd - strStart ), ENCODING_WINDOWS_1250);
 			}
@@ -151,7 +159,7 @@ namespace DocFileFormat
     {
 	  long strStart = reader->GetPosition();
       
-	  if (reader->olderVersion)
+	  if (reader->nWordVersion > 0)
 	  {//ansi string only
 		  while ( reader->ReadByte() != 0 )
 		  {

ASCOfficeDocFile/DocDocxConverter/FontFamilyName.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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;

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() ;
 	}
 }

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)

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)
@@ -71,7 +71,7 @@ namespace DocFileFormat
 			if (fc < 0) break;
 
 			ParagraphPropertyExceptions* papx = findValidPapx( fc );
-			TableInfo tai( papx );
+			TableInfo tai( papx, m_document->nWordVersion );
 
 			if ( tai.fInTable )
 			{
@@ -89,7 +89,7 @@ namespace DocFileFormat
 			else
 			{
 				//this PAPX is for a normal paragraph
-				cp = writeParagraph( cp );
+				cp = writeParagraph( cp, 0x7fffffff );
 			}
 		}
 

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)

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)

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)
@@ -75,11 +75,13 @@ namespace DocFileFormat
 
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText ) < (*m_document->IndividualFootnotesPlex)[id + 1] )
 					{
+						int cpStart = cp;
+						
 						int fc =  m_document->FindFileCharPos(cp);
 						if (fc < 0) break;
 
 						ParagraphPropertyExceptions* papx = findValidPapx( fc );
-						TableInfo tai( papx );
+						TableInfo tai( papx, m_document->nWordVersion );
 
 						if ( tai.fInTable )
 						{
@@ -91,8 +93,10 @@ namespace DocFileFormat
 						else
 						{
 							//this PAPX is for a normal paragraph
-							cp = writeParagraph( cp );
+							cp = writeParagraph( cp, 0x7fffffff );
 						}
+						while (cp <= cpStart)	//conv_fQioC665ib4ngHkDGY4__docx.doc
+							cp++;
 					}
 
                     m_pXmlWriter->WriteNodeEnd( L"w:footnote");

ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp

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

ASCOfficeDocFile/DocDocxConverter/FormFieldData.h

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

ASCOfficeDocFile/DocDocxConverter/FormFieldDataMapping.h

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

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPage.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)
@@ -52,7 +52,7 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 
-	FormattedDiskPageCHPX::FormattedDiskPageCHPX( POLE::Stream* wordStream, int offset, bool oldVersion  ):
+	FormattedDiskPageCHPX::FormattedDiskPageCHPX( POLE::Stream* wordStream, int offset, int nWordVersion ):
 																FormattedDiskPage(), rgb(NULL), grpchpxSize(NULL), grpchpx(NULL) 
 	{
 		Type = Character;
@@ -80,7 +80,6 @@ namespace DocFileFormat
 			j += 4;
 		}
 
-		//create arrays
 		grpchpxSize		= crun;
 		rgb				= new unsigned char[crun];
 		grpchpx			= new CharacterPropertyExceptions*[grpchpxSize];
@@ -104,11 +103,10 @@ namespace DocFileFormat
 
 				//read the bytes of chpx
 				chpx = new unsigned char[cb];
-				//Array.Copy(bytes, (wordOffset * 2) + 1, chpx, 0, chpx.Length);
 				memcpy( chpx, ( bytes + (wordOffset * 2) + 1 ), cb );
 
 				//parse CHPX and fill grpchpx
-				grpchpx[i] = new CharacterPropertyExceptions( chpx, cb, oldVersion);
+				grpchpx[i] = new CharacterPropertyExceptions( chpx, cb, nWordVersion);
 
 				RELEASEARRAYOBJECTS( chpx );
 			}
@@ -139,7 +137,7 @@ namespace DocFileFormat
 		}
 		//there are n offsets and n-1 fkp's in the bin table
 
-		if (fib->m_bOlderVersion)
+		if (fib->m_nWordVersion > 0)
 		{
 			int				n		= ( ( (int)fib->m_FibWord97.lcbPlcfBteChpx - 8 ) / 6 ) + 1;
 	
@@ -162,7 +160,7 @@ namespace DocFileFormat
 				int offset = fkpnr * 512;
 
 				//parse the FKP and add it to the list
-				CHPXlist->push_back( new FormattedDiskPageCHPX( wordStream, offset, fib->m_bOlderVersion ) );
+				CHPXlist->push_back( new FormattedDiskPageCHPX( wordStream, offset, fib->m_nWordVersion ) );
 			}
 		}
 		else
@@ -178,7 +176,7 @@ namespace DocFileFormat
 				int offset = fkpnr * 512;
 
 				//parse the FKP and add it to the list
-				CHPXlist->push_back( new FormattedDiskPageCHPX( wordStream, offset, fib->m_bOlderVersion ) );
+				CHPXlist->push_back( new FormattedDiskPageCHPX( wordStream, offset, fib->m_nWordVersion ) );
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPageCHPX.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)
@@ -50,7 +50,7 @@ namespace DocFileFormat
 
     public:
 	  virtual ~FormattedDiskPageCHPX();
-      FormattedDiskPageCHPX( POLE::Stream* wordStream, int offset, bool oldVersion );
+      FormattedDiskPageCHPX( POLE::Stream* wordStream, int offset, int nWordVersion );
       /// Parses the 0Table (or 1Table) for FKP _entries containing CHPX
       static std::list<FormattedDiskPageCHPX*>* GetAllCHPXFKPs( FileInformationBlock* fib, POLE::Stream* wordStream, POLE::Stream* tableStream );
   };

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.cpp

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

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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,7 +63,7 @@ namespace DocFileFormat
 
     public:
       virtual ~FormattedDiskPagePAPX();
-	  FormattedDiskPagePAPX( POLE::Stream* wordStream, int offset, POLE::Stream* dataStream, bool oldVersion, bool fComplex);
+	  FormattedDiskPagePAPX( POLE::Stream* wordStream, int offset, POLE::Stream* dataStream, int nWordVersion, bool fComplex);
       /// Parses the 0Table (or 1Table) for FKP _entries containing PAPX
       static std::list<FormattedDiskPagePAPX*>* GetAllPAPXFKPs( FileInformationBlock* fib, POLE::Stream* wordStream, POLE::Stream* tableStream, POLE::Stream* dataStream);
       /// Returns a list of all PAPX FCs between they given boundaries.

ASCOfficeDocFile/DocDocxConverter/Global.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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,10 +38,30 @@ namespace Global
 	static const wchar_t ColorIdentifier[17][12] = 
 	{
         L"auto",
+        L"000000",//L"black",
+        L"0000FF",//L"blue",
+        L"00FFFF",//L"cyan",
+		L"00FF00",// L"green",
+        L"FF00FF",//L"magenta",
+        L"FF0000",//L"red",
+        L"FFFF00",//L"yellow",
+        L"FFFFFF",//L"white",
+        L"darkBlue",
+        L"darkCyan",
+        L"darkGreen",
+        L"darkMagenta",
+        L"darkRed",
+        L"darkYellow",
+        L"darkGray",
+        L"lightGray"
+	};
+	static const wchar_t ColorNameIdentifier[17][12] = 
+	{
+        L"auto",
         L"black",
         L"blue",
         L"cyan",
-        L"green",
+		L"green",
         L"magenta",
         L"red",
         L"yellow",
@@ -55,7 +75,6 @@ namespace Global
         L"darkGray",
         L"lightGray"
 	};
-
 	static const wchar_t UnderlineCode[56][16] =
 	{
         L"none",

ASCOfficeDocFile/DocDocxConverter/HeaderAndFooterTable.cpp

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

ASCOfficeDocFile/DocDocxConverter/HeaderAndFooterTable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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,10 +34,12 @@
 #include "CharacterRange.h"
 #include "FileInformationBlock.h"
 
-#define GET_CHARS_RANGE(NAME) inline CharacterRange* Get##NAME(int nIndex)	{\
+#define GET_CHARS_RANGE(NAME) inline CharacterRange* Get##NAME(int nIndex)\
+{\
 	if (m_ar##NAME.empty())					return NULL;	\
 	if (nIndex < (int)m_ar##NAME.size())	return m_ar##NAME[nIndex];\
-	return NULL;	}	\
+	return NULL;	\
+}\
 
 namespace DocFileFormat
 {
@@ -54,8 +56,17 @@ namespace DocFileFormat
 		GET_CHARS_RANGE (EvenFooters);
 		GET_CHARS_RANGE (OddFooters);
 
+	inline CharacterRange* GetNextHeaderFooter()
+	{
+		if (m_nCurrentIndex < m_arCommonHeadersFooters.size())	
+			return m_arCommonHeadersFooters[m_nCurrentIndex++];
+		
+		return NULL;
+	}
 	private: 
-
+		size_t							m_nCurrentIndex;
+		std::vector<CharacterRange*>	m_arCommonHeadersFooters;
+	
 		std::vector<CharacterRange*> m_arFirstHeaders;
 		std::vector<CharacterRange*> m_arEvenHeaders;
 		std::vector<CharacterRange*> m_arOddHeaders;

ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)
@@ -71,7 +71,7 @@ namespace DocFileFormat
 			if (fc < 0) break;
 
 			ParagraphPropertyExceptions* papx = findValidPapx( fc );
-			TableInfo tai( papx );
+			TableInfo tai( papx, m_document->nWordVersion );
 
 			if ( tai.fInTable )
 			{
@@ -84,7 +84,7 @@ namespace DocFileFormat
 			else
 			{
 				//this PAPX is for a normal paragraph
-				cp = writeParagraph( cp );
+				cp = writeParagraph( cp, 0x7fffffff );
 			}
 		}
 

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)

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)

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)

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)
@@ -33,6 +33,9 @@
 
 #include "IMapping.h"
 
+#define GETBITS(from, numL, numH) ((from & (((1 << (numH - numL + 1)) - 1) << numL)) >> numL)
+#define GETBIT(from, num) ((from & (1 << num)) != 0)
+
 namespace DocFileFormat
 {
     class IVisitable

ASCOfficeDocFile/DocDocxConverter/LanguageId.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)

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)

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)

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)
@@ -152,37 +152,53 @@ namespace DocFileFormat
 	}
 	OutlineListDescriptor::OutlineListDescriptor( unsigned char * data, int length )
 	{
-		int pos = 0;
+		if (length < 212)
+		{
+			//int sz  =  FormatUtils::BytesToUChar(data, 0, length);
+			int pos = 0;
 
-		for (int i = 0 ; i < 9; i++)
-		{
-            lvl[i].Parse(data + pos, length - pos);
-			pos += 16;
+			for (int i = 0 ; i < 9; i++)
+			{
+				lvl[i].Parse(data + pos, 1);
+				pos += 1;
+			}
 		}
+		else
+		{
+			int pos = 0;
 
-        fRestartHdr	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
-		fSpareOlst2	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
-		fSpareOlst3	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
-		fSpareOlst4	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
-		
-		short strLen = length - pos;
-		
-		while (strLen > 0)
-		{
-			if (data[strLen + 20 - 1] != 0)
-				break;
-			strLen--;
+			for (int i = 0 ; i < 9; i++)
+			{
+				lvl[i].Parse(data + pos, length - pos);
+				pos += 16;
+			}
+
+			fRestartHdr	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
+			fSpareOlst2	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
+			fSpareOlst3	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
+			fSpareOlst4	= FormatUtils::BytesToUChar(data, pos, length); pos += 2;
+			
+			short strLen = length - pos;
+			
+			while (strLen > 0)
+			{
+				if (data[strLen + 20 - 1] != 0)
+					break;
+				strLen--;
+			}
+			if (strLen > 0)
+			{
+				FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &(xst), data + 20, ( strLen ), ENCODING_WINDOWS_1250);
+			}	
 		}
-		if (strLen > 0)
-		{
-			FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &(xst), data + 20, ( strLen ), ENCODING_WINDOWS_1250);
-		}	
 	}
 
 	ByteStructure* OutlineListDescriptor::ConstructObject(VirtualStreamReader* reader, int length)
 	{
-		unsigned char *data = reader->ReadBytes(212, true);
-		OutlineListDescriptor *newObject = new OutlineListDescriptor(data, 212);
+		int sz = GetSize(reader->nWordVersion);
+
+		unsigned char *data = reader->ReadBytes(sz, true);
+		OutlineListDescriptor *newObject = new OutlineListDescriptor(data, sz);
 
 		delete []data;
 

ASCOfficeDocFile/DocDocxConverter/ListData.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)
@@ -143,8 +143,13 @@ namespace DocFileFormat
 
 		std::wstring	xst; //64 chars ansi
 
-	public:
 		static const int STRUCTURE_SIZE = 212;
+		static const int STRUCTURE_SIZE_OLD = 10;
+    public:
+		static const int GetSize(int nWordVersion)
+		{
+			return (nWordVersion == 2) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
+		}
         virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
 		
 		virtual ~OutlineListDescriptor();

ASCOfficeDocFile/DocDocxConverter/ListFormatOverride.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)

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)
@@ -49,7 +49,7 @@ namespace DocFileFormat
       {
 	    if ( fib->m_FibWord97.lcbPlfLfo > 0 )
         {
-	      VirtualStreamReader reader( tableStream, fib->m_FibWord97.fcPlfLfo, fib->m_bOlderVersion);
+	      VirtualStreamReader reader( tableStream, fib->m_FibWord97.fcPlfLfo, fib->m_nWordVersion);
             
 		  if (fib->m_FibWord97.fcPlfLfo > reader.GetSize()) return;
             

ASCOfficeDocFile/DocDocxConverter/ListLevel.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)
@@ -77,7 +77,7 @@ namespace DocFileFormat
 		//this papx has no istd, so use PX to parse it
 		unsigned char *bytes	= reader->ReadBytes( cbGrpprlPapx, true );
 
-		PropertyExceptions* px	= new PropertyExceptions( bytes, cbGrpprlPapx, reader->olderVersion);
+		PropertyExceptions* px	= new PropertyExceptions( bytes, cbGrpprlPapx, reader->nWordVersion);
 		grpprlPapx				= new ParagraphPropertyExceptions( *(px->grpprl) );
 
 		RELEASEOBJECT( px );
@@ -85,7 +85,7 @@ namespace DocFileFormat
 
 		//read the group of chpx sprms
 		bytes = reader->ReadBytes( cbGrpprlChpx, true );
-		grpprlChpx = new CharacterPropertyExceptions( bytes, cbGrpprlChpx, reader->olderVersion );
+		grpprlChpx = new CharacterPropertyExceptions( bytes, cbGrpprlChpx, reader->nWordVersion );
 		RELEASEARRAYOBJECTS( bytes );
 
 		//read the number text
@@ -116,6 +116,10 @@ namespace DocFileFormat
 
     void NumberingLevelDescriptor::Parse(unsigned char * data, int length )
     {
+		if (length < 16)
+		{
+			return;
+		}
         bEnabled        = true;
 
         nfc				= FormatUtils::BytesToUChar(data, 0, length);

ASCOfficeDocFile/DocDocxConverter/ListLevel.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)
@@ -45,7 +45,7 @@ namespace DocFileFormat
 	{
 		if ( fib->m_FibWord97.lcbPlfLst > 0 )
 		{
-			VirtualStreamReader reader( tableStream, fib->m_FibWord97.fcPlfLst, fib->m_bOlderVersion);
+			VirtualStreamReader reader( tableStream, fib->m_FibWord97.fcPlfLst, fib->m_nWordVersion);
 			
 			if (fib->m_FibWord97.fcPlfLst > reader.GetSize()) return;
 

ASCOfficeDocFile/DocDocxConverter/ListTable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)
@@ -50,8 +50,7 @@ namespace DocFileFormat
 	void MainDocumentMapping::Apply(IVisitable* visited)
 	{
 		m_document = static_cast<WordDocument*>(visited);
-		m_context->_docx->RegisterDocument();
-
+		
 		// Header
 		m_pXmlWriter->WriteNodeBegin(L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
 		m_pXmlWriter->WriteNodeBegin(L"w:document", TRUE );
@@ -111,7 +110,7 @@ namespace DocFileFormat
 		int countText		=	m_document->FIB->m_RgLw97.ccpText;
 		int countTextRel	=	m_document->FIB->m_RgLw97.ccpText - 1;
 							
-		while (cp < countText)
+		while (cp < countText && cp >= 0)
 		{
 			fc = m_document->FindFileCharPos(cp);
 				
@@ -121,19 +120,22 @@ namespace DocFileFormat
 
 			if (papx)
 			{
-				TableInfo tai(papx);
+				TableInfo tai(papx, m_document->nWordVersion);
 				if (tai.fInTable)
 				{
+					int cpStart = cp;
 					//this PAPX is for a table
 					//cp = writeTable( cp, tai.iTap );
 					Table table( this, cp, ( ( tai.iTap > 0 ) ? ( 1 ) : ( 0 ) ) );
 					table.Convert(this);
 					cp = table.GetCPEnd();
+					while (cp <= cpStart)	//conv_eznHsm8em2unSv6_2QE__docx.doc
+						cp++;
 				}
 				else
 				{
 					//this PAPX is for a normal paragraph
-					cp = writeParagraph(cp);
+					cp = writeParagraph(cp, countTextRel);
 				}
 			}
 			else

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)

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)
@@ -72,7 +72,7 @@ public:
 
 		if (m_Data)
 		{
-			rdUShort	=	FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
+            rdUShort	=	DocFileFormat::FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUShort);
 		}
 
@@ -85,7 +85,7 @@ public:
 
 		if (m_Data)
 		{
-			rdShort		=	FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
+            rdShort		=	DocFileFormat::FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdShort);
 		}
 
@@ -98,7 +98,7 @@ public:
 
 		if (m_Data)
 		{
-			rdInt		=	FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
+            rdInt		=	DocFileFormat::FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdInt);
 		}
 
@@ -111,7 +111,7 @@ public:
 
 		if (m_Data )
 		{
-			rdUInt		=	FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
+            rdUInt		=	DocFileFormat::FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUInt);
 		}
 
@@ -124,7 +124,7 @@ public:
 
 		if (m_Data)
 		{
-			rdByte		=	m_Data[m_Position];
+			rdByte		=	(m_Position < m_Size) ? m_Data[m_Position] : 0;
 			m_Position	+=	sizeof(rdByte);
 		}
 

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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;
 		}
 	}
 
@@ -338,9 +338,9 @@ namespace DocFileFormat
 	}
 
 
-	std::wstring NumberingMapping::GetNumberFormatWideString(int nfc, bool bOlderVersion)
+	std::wstring NumberingMapping::GetNumberFormatWideString(int nfc, int nWordVersion)
 	{
-		if (bOlderVersion && nfc > 5)
+		if (nWordVersion > 0 && nfc > 5)
 		{
             if (nfc == 0xff)	return std::wstring( L"bullet");
             else				return std::wstring( L"none");
@@ -582,7 +582,7 @@ namespace DocFileFormat
 // The style id is used for a reverse reference. 
 // It can happen that the reference points to the wrong style.
 
-		if (styleIndex != ListData::ISTD_NIL)
+		if (styleIndex != ListData::ISTD_NIL && styleIndex < m_document->Styles->Styles->size())
 		{
             m_pXmlWriter->WriteNodeBegin( L"w:pStyle", TRUE );
             m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId(m_document->Styles->Styles->at(styleIndex))));
@@ -633,7 +633,7 @@ namespace DocFileFormat
 
 			if ((chpxs != NULL) && (!chpxs->empty()))
 			{
-				PictureDescriptor pict(chpxs->front(), m_document->DataStream, fcEnd - fc, m_document->FIB->m_bOlderVersion);
+				PictureDescriptor pict(chpxs->front(), m_document->DataStream, fcEnd - fc, m_document->nWordVersion);
 
 				if ((pict.mfp.mm > 98) && (pict.shapeContainer != NULL))
 				{

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)
@@ -65,7 +65,7 @@ namespace DocFileFormat
 		
 		static int FindIndexbyId(const std::list<ListData*>& listData, int id);
 		/// Converts the number format code of the binary format.
-		static std::wstring GetNumberFormatWideString(int nfc, bool bOlderVersion = false);
+		static std::wstring GetNumberFormatWideString(int nfc, int nWordVersion = 0);
 		
 		virtual ~NumberingMapping();
 

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)
@@ -60,7 +60,7 @@ namespace DocFileFormat
 
 		OfficeArtContent (const FileInformationBlock* pFIB, POLE::Stream* pStream): m_pDrawingGroupData(NULL), m_pBackgroud(NULL)
 		{
-			VirtualStreamReader oStearmReader(pStream, 0 , pFIB->m_bOlderVersion);
+			VirtualStreamReader oStearmReader(pStream, 0 , pFIB->m_nWordVersion);
 
 			if (pFIB->m_FibWord97.fcDggInfo > oStearmReader.GetSize()) return;
 

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)

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)

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);

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)
@@ -60,7 +60,7 @@ namespace DocFileFormat
 			_size.cx	=	Right - Left;
 			_size.cy	=	Bottom - Top;
 
-			rcgBounds	=	DocFormatUtils::Rectangle (_point, _size);
+			rcgBounds	=	DocFileFormat::Rectangle (_point, _size);
 		}
 
 		virtual ~ChildAnchor()
@@ -75,7 +75,7 @@ namespace DocFileFormat
 	public:
 
 		/// Rectangle that describes the bounds of the anchor
-		DocFormatUtils::Rectangle rcgBounds;
+		DocFileFormat::Rectangle rcgBounds;
 		int Left;
 		int Top;
 		int Right;

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientAnchor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-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)

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)

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)

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)

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)