fix bug #35277

XlsFormatReader - adding decrypt for format 1995, adding xor method decrypting

.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-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)

ASCOfficeDocFile/Common/Callback.h

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

ASCOfficeDocFile/Common/FormatUtils.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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,10 +501,11 @@ namespace DocFormatUtils
     
 			facet.widen((char*)bytes, (char*)bytes + size, &result[0]);
 			
-			for (long i=0; i < result.length(); i++)
+			for (size_t i=0; i < result.length(); i++)
 			{
 				STLCollection->push_back(result[i]);
 			}
+            return true;
 		}
 
 		template<class T> static bool GetSTLCollectionFromUtf8( T *STLCollection, unsigned char *bytes, int size)
@@ -535,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]);
 				}
@@ -565,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]);
 				}
@@ -651,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]);
 				}
@@ -770,6 +771,7 @@ namespace DocFormatUtils
 		{
             return (std::to_wstring(value));
 		}
+
 		static inline std::wstring DoubleToWideString(double value)
 		{
 			std::wstringstream src;			
@@ -961,4 +963,3 @@ namespace DocFormatUtils
 	};
 }
 
-using namespace DocFormatUtils;

ASCOfficeDocFile/Common/IOperand.h

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

ASCOfficeDocFile/Common/IVirtualConstructor.h

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

ASCOfficeDocFile/Common/LanguageCodes.h

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

ASCOfficeDocFile/Common/SPRMCodes.h

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

ASCOfficeDocFile/Common/Singleton.h

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

ASCOfficeDocFile/Common/TargetOptions.h

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

ASCOfficeDocFile/Common/TextMark.h

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

ASCOfficeDocFile/Common/XmlTools.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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;
@@ -406,34 +406,12 @@ namespace XMLTools
 
 		void WriteInteger(int Value, int Base = 10)
 		{
-#if defined(_WIN32) || defined (_WIN64)
-            wchar_t buff[33] ={};
-            _itow(Value, buff, Base);
-            m_str += std::wstring(buff);
-#else
             m_str += std::to_wstring(Value);
-#endif
 		}
 
 		void WriteDouble(double Value)
 		{
-#if defined(_WIN32) || defined (_WIN64)
-            int *dec = NULL, *sign = NULL;
-			char *str = _fcvt( Value , 4, dec, sign);
-
-			if (str)
-			{
-				std::string sA(str);
-				delete []str;	
-				m_str += std::wstring(sA.begin(), sA.end());
-			}
-			else
-			{
-				m_str += L"0";
-			}
-#else
             m_str += std::to_wstring(Value);
-#endif
         }
 		void WriteBoolean(bool Value)
 		{

ASCOfficeDocFile/Common/utf8.h

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

ASCOfficeDocFile/DocDocxConverter/AbstractOpenXmlMapping.h

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

ASCOfficeDocFile/DocDocxConverter/AnnotationOwnerList.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/AnnotationReferenceDescriptor.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -76,4 +76,4 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>(newObject);
 	}
-}
+}

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/AutoSummaryInfo.h

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

ASCOfficeDocFile/DocDocxConverter/BookmarkFirst.h

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

ASCOfficeDocFile/DocDocxConverter/BorderCode.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/ByteStructure.h

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

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -38,7 +38,7 @@ namespace DocFileFormat
 		: PropertiesMapping( writer ), _isRunStyleNeeded(isRunStyleNeeded), _isOwnRPr(true), _isRTL(false)
 	{
 		_doc			= doc;
-        _rPr			= new XMLTools::XMLElement( _T( "w:rPr" ) );
+        _rPr			= new XMLTools::XMLElement( L"w:rPr");
 		_revisionData	= rev;
 		_currentPapx	= currentPapx;
 		_styleChpx		= styleChpx;
@@ -77,7 +77,7 @@ namespace DocFileFormat
 		// apend revision changes
 		if (_revisionData->Type == Changed)
 		{
-            XMLTools::XMLElement rPrChange( _T( "w:rPrChange" ) );
+            XMLTools::XMLElement rPrChange( L"w:rPrChange");
 
 			//todooo date - _revisionData->Dttm.Convert( new DateMapping( rPrChange ) );
 
@@ -85,7 +85,7 @@ namespace DocFileFormat
 			
 			if (author_str)
 			{
-                XMLTools::XMLAttribute author( _T( "w:author" ), FormatUtils::XmlEncode(*author_str));
+                XMLTools::XMLAttribute author( L"w:author", FormatUtils::XmlEncode(*author_str));
 				rPrChange.AppendAttribute( author );
 			}
 
@@ -108,7 +108,7 @@ namespace DocFileFormat
 	{
 		//Todo сделать определение симольного шрифта через fontManager
 		//Заглушка под Google Docs, они пишут bullet в Arial
-		if (-1 != m_sAsciiFont.find (_T("Arial")) && -1 != m_sEastAsiaFont.find (_T("Arial")) && -1 != m_shAnsiFont.find (_T("Arial")))
+        if (-1 != m_sAsciiFont.find (L"Arial") && -1 != m_sEastAsiaFont.find (L"Arial") && -1 != m_shAnsiFont.find (L"Arial"))
 			return false;
 
 		return true;
@@ -118,14 +118,14 @@ namespace DocFileFormat
 
     void CharacterPropertiesMapping::convertSprms( std::list<SinglePropertyModifier>* sprms, XMLTools::XMLElement* parent )
 	{
-        XMLTools::XMLElement	* rFonts	= new XMLTools::XMLElement		( _T( "w:rFonts" ) );
-        XMLTools::XMLElement	* color		= new XMLTools::XMLElement		( _T( "w:color" ) );
-        XMLTools::XMLAttribute	* colorVal	= new XMLTools::XMLAttribute	( _T( "w:val" ) );
-        XMLTools::XMLElement	* lang		= new XMLTools::XMLElement		( _T( "w:lang" ) );
+        XMLTools::XMLElement	* rFonts	= new XMLTools::XMLElement		( L"w:rFonts" );
+        XMLTools::XMLElement	* color		= new XMLTools::XMLElement		( L"w:color" );
+        XMLTools::XMLAttribute	* colorVal	= new XMLTools::XMLAttribute	( L"w:val" );
+        XMLTools::XMLElement	* lang		= new XMLTools::XMLElement		( L"w:lang" );
 
 		if (_webHidden)
 		{
-            XMLTools::XMLElement	* webHidden		= new XMLTools::XMLElement	( _T( "w:webHidden" ) );
+            XMLTools::XMLElement	* webHidden		= new XMLTools::XMLElement	( L"w:webHidden" );
 			parent->AppendChild( *webHidden );
 			RELEASEOBJECT( webHidden );
 		}
@@ -144,95 +144,96 @@ namespace DocFileFormat
 						_currentIstd = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
 						if (_currentIstd < _doc->Styles->Styles->size())
 						{
-							appendValueElement( parent, _T( "rStyle" ), StyleSheetMapping::MakeStyleId( _doc->Styles->Styles->at( _currentIstd ) ), true );
+                            appendValueElement( parent, L"rStyle", StyleSheetMapping::MakeStyleId( _doc->Styles->Styles->at( _currentIstd ) ), true );
 						}
 					}
 				}break;	
 
 			case sprmCFBiDi :
-				appendFlagElement( parent, *iter, _T( "rtl" ), true );
+                appendFlagElement( parent, *iter, L"rtl", true );
 				_isRTL = true;
 				break;
 
 			case sprmOldCFBold :
 			case sprmCFBold :
-				appendFlagElement( parent, *iter, _T( "b" ), true );
+                appendFlagElement( parent, *iter, L"b", true );
 				break;
 
 			case sprmCFBoldBi :
-				appendFlagElement( parent, *iter, _T( "bCs" ), true );
+                appendFlagElement( parent, *iter, L"bCs", true );
 				break;
 
 			case sprmOldCFCaps :
 			case sprmCFCaps :
-				appendFlagElement( parent, *iter, _T( "caps" ), true );
+                appendFlagElement( parent, *iter, L"caps", true );
 				break;
 
 			case sprmCFComplexScripts :
-				appendFlagElement( parent, *iter, _T( "cs" ), true );
+                appendFlagElement( parent, *iter, L"cs", true );
 				break;
 
 			case sprmCFDStrike :
-				appendFlagElement( parent, *iter, _T( "dstrike" ), true );
+                appendFlagElement( parent, *iter, L"dstrike", true );
 				break;
 
 			case sprmCFEmboss :
-				appendFlagElement( parent, *iter, _T( "emboss" ), true );
+                appendFlagElement( parent, *iter, L"emboss", true );
 				break;
 
 			case sprmCFImprint :
-				appendFlagElement( parent, *iter, _T( "imprint" ), true );
+                appendFlagElement( parent, *iter, L"imprint", true );
 				break;
 
 			case sprmOldCFItalic :
 			case sprmCFItalic :
-				appendFlagElement( parent, *iter, _T( "i" ), true );
+                appendFlagElement( parent, *iter, L"i", true );
 				break;
 
 			case sprmCFItalicBi:
-				appendFlagElement( parent, *iter, _T( "iCs" ), true );
+                appendFlagElement( parent, *iter, L"iCs", true );
 				break;
 
 			case 0x0875:
-				appendFlagElement( parent, *iter, _T( "noProof" ), true );
+                appendFlagElement( parent, *iter, L"noProof", true );
 				break;
 
 			case sprmOldCFOutline:
 			case sprmCFOutline:
-				appendFlagElement( parent, *iter, _T( "outline" ), true );
+                appendFlagElement( parent, *iter, L"outline", true );
 				break;
 
 			case sprmOldCFShadow:
 			case sprmCFShadow:
-				appendFlagElement( parent, *iter, _T( "shadow" ), true );
+                appendFlagElement( parent, *iter, L"shadow", true );
 				break;
 
 			case sprmOldCFSmallCaps:
 			case sprmCFSmallCaps:
-				appendFlagElement( parent, *iter, _T( "smallCaps" ), true );
+                appendFlagElement( parent, *iter, L"smallCaps", true );
 				break;
 
 			case sprmCFSpecVanish:
-				appendFlagElement( parent, *iter, _T( "specVanish" ), true );
+                appendFlagElement( parent, *iter, L"specVanish", true );
 				break;
 
 			case sprmOldCFStrike:
 			case sprmCFStrike:
-				appendFlagElement( parent, *iter, _T( "strike" ), true );
+                appendFlagElement( parent, *iter, L"strike", true );
 				break;
 
 			case sprmOldCFVanish:
 			case sprmCFVanish:
-				appendFlagElement( parent, *iter, _T( "vanish" ), true );
+                appendFlagElement( parent, *iter, L"vanish", true );
 				break;
 
 			case 0x0811:
-				appendFlagElement( parent, *iter, _T( "webHidden" ), true );
+                appendFlagElement( parent, *iter, L"webHidden", true );
 				break;
 
 			case sprmOldCIss:
 			case sprmCIss:
-				appendValueElement( parent, _T( "vertAlign" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ), true );
+				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:
@@ -274,7 +275,7 @@ namespace DocFileFormat
 			case sprmCBrc80:
 			case sprmCBrc:
 				{  //borders
-                    XMLTools::XMLElement bdr( _T( "w:bdr" ) );
+                    XMLTools::XMLElement bdr( L"w:bdr" );
 					BorderCode bc( iter->Arguments, iter->argumentsSize );
 					appendBorderAttributes( &bc, &bdr );
 					parent->AppendChild( bdr );
@@ -305,22 +306,22 @@ namespace DocFileFormat
 
 			case sprmCOldHighlight:
 				{
-					appendValueElement( parent, _T( "highlight" ), FormatUtils::MapValueToWideString( iter->Arguments[1], &Global::ColorIdentifier[0][0], 17, 12 ), true );
+                    appendValueElement( parent, L"highlight", FormatUtils::MapValueToWideString( iter->Arguments[1], &Global::ColorIdentifier[0][0], 17, 12 ), true );
 				}break;	
 			case sprmCHighlight:
 				{
-					appendValueElement( parent, _T( "highlight" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ), true );
+                    appendValueElement( parent, L"highlight", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ), true );
 				}break;	
 
 			case sprmOldCDxaSpace:
 			case sprmCDxaSpace:
 				{
-					appendValueElement( parent, _T( "spacing" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
+                    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);
+					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 ) );
@@ -331,20 +332,20 @@ namespace DocFileFormat
 
 			case sprmCHpsBi :
 				{
-					appendValueElement( parent, _T( "szCs" ), 
+                    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, _T( "sz" ), 
+                    appendValueElement (parent, L"sz",
 						FormatUtils::IntToWideString (FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize) ),
 						true );
 				}break;
 			case sprmCHps : 
 				{  
-					appendValueElement (parent, _T( "sz" ), 
+                    appendValueElement (parent, L"sz",
 						FormatUtils::IntToWideString (FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize) ), true );						
 				}break;
 
@@ -355,28 +356,28 @@ namespace DocFileFormat
 			case sprmOldCHpsPos: 
 				{	// The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168)
 					short nVertPos = FormatUtils::BytesToUChar(iter->Arguments, 0, iter->argumentsSize);
-					appendValueElement (parent, _T("position"), nVertPos, true);
+                    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, _T("position"), nVertPos, true);
+                    appendValueElement (parent, L"position", nVertPos, true);
 				}break;
 
 			case sprmOldCHpsKern:
 			case sprmCHpsKern:
 				{
-					appendValueElement( parent, _T( "kern" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
+                    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 );
+					size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
 					
 					if( nIndex < _doc->FontTable->Data.size() )
 					{
-                        XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( _T( "w:ascii" ) );
+                        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));
@@ -387,10 +388,11 @@ namespace DocFileFormat
 
 			case sprmCRgFtc1:
 				{
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+					size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+
 					if( nIndex >= 0 && nIndex < _doc->FontTable->Data.size() )
 					{
-                        XMLTools::XMLAttribute* eastAsia = new XMLTools::XMLAttribute( _T( "w:eastAsia" ) );
+                        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));
@@ -402,10 +404,11 @@ namespace DocFileFormat
 
 			case sprmCRgFtc2:
 				{
-					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+					size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+
 					if( nIndex>=0 && nIndex < _doc->FontTable->Data.size() )
 					{
-                        XMLTools::XMLAttribute* ansi = new XMLTools::XMLAttribute( _T( "w:hAnsi" ) );
+                        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));
@@ -417,18 +420,18 @@ namespace DocFileFormat
 			case sprmOldCKul:
 			case sprmCKul:
 				{	//Underlining
-					appendValueElement( parent, _T( "u" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::UnderlineCode[0][0], 56, 16 ), true );
+                    appendValueElement( parent, L"u", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::UnderlineCode[0][0], 56, 16 ), true );
 				}
 				break;		
 
 			case sprmCCharScale:
 				{	//char width
-					appendValueElement( parent, _T( "w" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
+                    appendValueElement( parent, L"w", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
 				}break;	
 							
 			case sprmCSfxText:
 				{	//animation
-					appendValueElement( parent, _T( "effect" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextAnimation[0][0], 7, 16 ), true );
+                    appendValueElement( parent, L"effect", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextAnimation[0][0], 7, 16 ), true );
 				}break;	
 
 			case sprmCIdctHint:
@@ -482,7 +485,7 @@ namespace DocFileFormat
 
 		if (!m_sDefaultFont.empty() && m_sAsciiFont.empty() && m_sEastAsiaFont.empty() && m_shAnsiFont.empty())
 		{//????
-            XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( _T( "w:ascii" ) );
+            XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( L"w:ascii" );
 			ascii->SetValue( FormatUtils::XmlEncode(m_sDefaultFont));
 			//rFonts->AppendAttribute( *ascii );
 			RELEASEOBJECT( ascii );
@@ -501,7 +504,7 @@ namespace DocFileFormat
 		}
 
 		//append color
-		if ( colorVal->GetValue() != _T( "" ) )
+        if ( colorVal->GetValue() != L"")
 		{
 			color->AppendAttribute( *colorVal );
 			parent->AppendChild( *color );
@@ -523,8 +526,8 @@ namespace DocFileFormat
 
 		if( flag != 128 )
 		{
-            XMLTools::XMLElement* ele = new XMLTools::XMLElement( _T( "w" ), elementName );
-            XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( _T( "w:val" ) );
+            XMLTools::XMLElement* ele = new XMLTools::XMLElement( L"w", elementName );
+            XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( L"w:val" );
 
 			if ( unique )
 			{
@@ -533,7 +536,7 @@ namespace DocFileFormat
 
 			if ( flag == 0 )
 			{
-				val->SetValue( _T( "false" ) );
+                val->SetValue( L"false" );
 				ele->AppendAttribute( *val );
 				node->AppendChild( *ele );
 			}
@@ -576,7 +579,7 @@ namespace DocFileFormat
 				//invert it
 				if ( stylesVal )
 				{
-					val->SetValue( _T( "false" ) );
+                    val->SetValue( L"false" );
 					ele->AppendAttribute( *val );
 				}
 

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/CharacterRange.h

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

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

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

ASCOfficeDocFile/DocDocxConverter/ContentTypes.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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,129 +40,135 @@
 namespace OpenXmlContentTypes
 {
 	// default content types
-	static const TCHAR* Xml						=	_T("application/xml");
+    static const wchar_t* Xml					=	L"application/xml";
 
 	// package content types
-	static const TCHAR* Relationships			=	_T("application/vnd.openxmlformats-package.relationships+xml");
+    static const wchar_t* Relationships			=	L"application/vnd.openxmlformats-package.relationships+xml";
 
-	static const TCHAR* CoreProperties			=	_T("application/vnd.openxmlformats-package.core-properties+xml");
+    static const wchar_t* CoreProperties		=	L"application/vnd.openxmlformats-package.core-properties+xml";
 
 	// general office document content types
-	static const TCHAR* ExtendedProperties		=	_T("application/vnd.openxmlformats-officedocument.extended-properties+xml");
-	static const TCHAR* Theme					=	_T("application/vnd.openxmlformats-officedocument.theme+xml");
+    static const wchar_t* ExtendedProperties	=	L"application/vnd.openxmlformats-officedocument.extended-properties+xml";
+    static const wchar_t* Theme					=	L"application/vnd.openxmlformats-officedocument.theme+xml";
 
-	static const TCHAR* CustomXmlProperties		=	_T("application/vnd.openxmlformats-officedocument.customXmlProperties+xml");
+    static const wchar_t* CustomXmlProperties	=	L"application/vnd.openxmlformats-officedocument.customXmlProperties+xml";
 
-	static const TCHAR* OleObject				=	_T("application/vnd.openxmlformats-officedocument.oleObject");
-	static const TCHAR* Vml						=	_T("application/vnd.openxmlformats-officedocument.vmlDrawing");
-	static const TCHAR* Drawing					=	_T("application/vnd.openxmlformats-officedocument.drawing+xml");
+    static const wchar_t* OleObject				=	L"application/vnd.openxmlformats-officedocument.oleObject";
+    static const wchar_t* Vml					=	L"application/vnd.openxmlformats-officedocument.vmlDrawing";
+    static const wchar_t* Drawing				=	L"application/vnd.openxmlformats-officedocument.drawing+xml";
 	
-	static const TCHAR* MSWordDocx				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+    static const wchar_t* MSWordDocx			=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.document";
 
-	static const TCHAR* MSExcel					=	_T("application/vnd.ms-excel");
-	static const TCHAR* MSWord					=	_T("application/msword");
-	static const TCHAR* MSPowerpoint			=	_T("application/vnd.ms-powerpoint");
+    static const wchar_t* MSExcel				=	L"application/vnd.ms-excel";
+    static const wchar_t* MSWord				=	L"application/msword";
+    static const wchar_t* MSPowerpoint			=	L"application/vnd.ms-powerpoint";
 
-	static const TCHAR* Emf						=	_T("image/x-emf");
-	static const TCHAR* Jpeg					=	_T("image/jpeg");
-	static const TCHAR* Png						=	_T("image/png");
-	static const TCHAR* Tiff					=	_T("image/tiff");
-	static const TCHAR* Wmf						=	_T("image/x-wmf");
-	static const TCHAR* Bmp						=	_T("image/bmp");
+    static const wchar_t* Emf					=	L"image/x-emf";
+    static const wchar_t* Jpeg					=	L"image/jpeg";
+    static const wchar_t* Png					=	L"image/png";
+    static const wchar_t* Tiff					=	L"image/tiff";
+    static const wchar_t* Wmf					=	L"image/x-wmf";
+    static const wchar_t* Bmp					=	L"image/bmp";
+	static const wchar_t* Pcz					=	L"image/x-pcz";
+}
+namespace DocPrContentTypes
+{
+    static const wchar_t* App			=	L"application/vnd.openxmlformats-officedocument.extended-properties+xml";
+    static const wchar_t* Core			=	L"application/vnd.openxmlformats-package.core-properties+xml";
 }
-
 namespace WordprocessingMLContentTypes
 {
 	// WordprocessingML content types
-	static const TCHAR* MainDocument			=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml");
-	static const TCHAR* MainDocumentMacro		=	_T("application/vnd.ms-word.document.macroEnabled.main+xml");
-	static const TCHAR* MainDocumentTemplate	=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml");
-	static const TCHAR* MainDocumentMacroTemplate =	_T("application/vnd.ms-word.template.macroEnabledTemplate.main+xml");
+    static const wchar_t* MainDocument			=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml";
+    static const wchar_t* MainDocumentMacro		=	L"application/vnd.ms-word.document.macroEnabled.main+xml";
+    static const wchar_t* MainDocumentTemplate	=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml";
+    static const wchar_t* MainDocumentMacroTemplate =	L"application/vnd.ms-word.template.macroEnabledTemplate.main+xml";
 
-	static const TCHAR* Styles					=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml");
-	static const TCHAR* Numbering				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml");
-	static const TCHAR* FontTable				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml");
-	static const TCHAR* WebSettings				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml");
-	static const TCHAR* Settings				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml");
+    static const wchar_t* Styles				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml";
+    static const wchar_t* Numbering				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml";
+    static const wchar_t* FontTable				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml";
+    static const wchar_t* WebSettings			=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml";
+    static const wchar_t* Settings				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml";
 
-	static const TCHAR* Comments				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml");
+    static const wchar_t* Comments				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml";
 
-	static const TCHAR* Footnotes				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"); 
-	static const TCHAR* Endnotes				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml");
+    static const wchar_t* Footnotes				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml";
+    static const wchar_t* Endnotes				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml";
 
-	static const TCHAR* Header					=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml");
-	static const TCHAR* Footer					=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml");
+    static const wchar_t* Header				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml";
+    static const wchar_t* Footer				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml";
 
-	static const TCHAR* Glossary				=	_T("application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml");
+    static const wchar_t* Glossary				=	L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml";
 }
 
 namespace MicrosoftWordContentTypes
 {
-	static const TCHAR* KeyMapCustomization		=	_T("application/vnd.ms-word.keyMapCustomizations+xml");
-	static const TCHAR* VbaProject				=	_T("application/vnd.ms-office.vbaProject");
-	static const TCHAR* VbaData					=	_T("application/vnd.ms-word.vbaData+xml");
-	static const TCHAR* Toolbars				=	_T("application/vnd.ms-word.attachedToolbars");
+    static const wchar_t* KeyMapCustomization	=	L"application/vnd.ms-word.keyMapCustomizations+xml";
+    static const wchar_t* VbaProject			=	L"application/vnd.ms-office.vbaProject";
+    static const wchar_t* VbaData				=	L"application/vnd.ms-word.vbaData+xml";
+    static const wchar_t* Toolbars				=	L"application/vnd.ms-word.attachedToolbars";
 }
 
 namespace OpenXmlNamespaces
 {
 	// package namespaces
-	static const TCHAR* ContentTypes			=	_T("http://schemas.openxmlformats.org/package/2006/content-types");
-	static const TCHAR* RelationshipsPackage	=	_T("http://schemas.openxmlformats.org/package/2006/relationships");
-	static const TCHAR* Relationships			=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+    static const wchar_t* ContentTypes			=	L"http://schemas.openxmlformats.org/package/2006/content-types";
+    static const wchar_t* RelationshipsPackage	=	L"http://schemas.openxmlformats.org/package/2006/relationships";
+    static const wchar_t* Relationships			=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships";
 
 	// Drawing ML namespaces
-	static const TCHAR* DrawingML				=	_T("http://schemas.openxmlformats.org/drawingml/2006/main");
-	static const TCHAR* DrawingMLPicture		=	_T("http://schemas.openxmlformats.org/drawingml/2006/picture");
+    static const wchar_t* DrawingML				=	L"http://schemas.openxmlformats.org/drawingml/2006/main";
+    static const wchar_t* DrawingMLPicture		=	L"http://schemas.openxmlformats.org/drawingml/2006/picture";
 
 	// WordprocessingML namespaces
-	static const TCHAR* WordprocessingML		=	_T("http://schemas.openxmlformats.org/wordprocessingml/2006/main");
-	static const TCHAR* WordprocessingDrawingML =	_T("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
-	static const TCHAR* VectorML				=	_T("urn:schemas-microsoft-com:vml");
-	static const TCHAR* MicrosoftWordML			=	_T("http://schemas.microsoft.com/office/word/2006/wordml");
+    static const wchar_t* WordprocessingML		=	L"http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+    static const wchar_t* WordprocessingDrawingML =	L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing";
+    static const wchar_t* VectorML				=	L"urn:schemas-microsoft-com:vml";
+    static const wchar_t* MicrosoftWordML		=	L"http://schemas.microsoft.com/office/word/2006/wordml";
 
 	// PresentationML namespaces
-	static const TCHAR* PresentationML			=	_T("http://schemas.openxmlformats.org/presentationml/2006/main");
+    static const wchar_t* PresentationML		=	L"http://schemas.openxmlformats.org/presentationml/2006/main";
 
 	// SpreadsheetML Namespaces
-	static const TCHAR* SharedStringML			=	_T("http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-	static const TCHAR* WorkBookML				=	_T("http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-	static const TCHAR* StylesML				=	_T("http://schemas.openxmlformats.org/spreadsheetml/2006/main"); 
+    static const wchar_t* SharedStringML		=	L"http://schemas.openxmlformats.org/spreadsheetml/2006/main";
+    static const wchar_t* WorkBookML			=	L"http://schemas.openxmlformats.org/spreadsheetml/2006/main";
+    static const wchar_t* StylesML				=	L"http://schemas.openxmlformats.org/spreadsheetml/2006/main";
 
 	//Office
-	static const TCHAR* Office					=	_T("urn:schemas-microsoft-com:office:office");
-	static const TCHAR* OfficeWord				=	_T("urn:schemas-microsoft-com:office:word");
+    static const wchar_t* Office				=	L"urn:schemas-microsoft-com:office:office";
+    static const wchar_t* OfficeWord			=	L"urn:schemas-microsoft-com:office:word";
 }
 
 namespace OpenXmlRelationshipTypes
 {
-	static const TCHAR* CoreProperties			=	_T("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties");
-	static const TCHAR* ExtendedProperties		=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties");
+	static const wchar_t* CoreProperties		=	L"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
+    static const wchar_t* ExtendedProperties	=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";
 
-	static const TCHAR* Theme					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme");
-	static const TCHAR* OfficeDocument			=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument");
-	static const TCHAR* Styles					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles");
-	static const TCHAR* FontTable				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable");
-	static const TCHAR* Numbering				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"); 
-	static const TCHAR* WebSettings				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings");
-	static const TCHAR* Settings				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings");
-	static const TCHAR* CustomXml				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml");
-	static const TCHAR* CustomXmlProperties		=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps");
-	static const TCHAR* Comments				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments");
-	static const TCHAR* Footnotes				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes");
-	static const TCHAR* Endnotes				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes");
-	static const TCHAR* Header					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/header");
-	static const TCHAR* Footer					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer");
-	static const TCHAR* Image					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/image");
-	static const TCHAR* OleObject				=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject");
-	static const TCHAR* GlossaryDocument		=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument");
-	static const TCHAR* Package					=	_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/package");
+    static const wchar_t* Theme					=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme";
+    static const wchar_t* OfficeDocument		=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";
+    static const wchar_t* Styles				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles";
+    static const wchar_t* FontTable				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable";
+    static const wchar_t* Numbering				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering";
+    static const wchar_t* WebSettings			=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings";
+    static const wchar_t* Settings				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings";
+    static const wchar_t* CustomXml				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml";
+    static const wchar_t* CustomXmlProperties	=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps";
+    static const wchar_t* Comments				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments";
+    static const wchar_t* Footnotes				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes";
+    static const wchar_t* Endnotes				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes";
+    static const wchar_t* Header				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/header";
+    static const wchar_t* Footer				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer";
+    static const wchar_t* Image					=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
+    static const wchar_t* OleObject				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
+    static const wchar_t* GlossaryDocument		=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument";
+    static const wchar_t* Package				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
+    static const wchar_t* VbaProject			=	L"http://schemas.microsoft.com/office/2006/relationships/vbaProject";
 }
 
 namespace MicrosoftWordRelationshipTypes
 {
-	static const TCHAR* KeyMapCustomizations	=	_T("http://schemas.microsoft.com/office/2006/relationships/keyMapCustomizations");
-	static const TCHAR* VbaProject				=	_T("http://schemas.microsoft.com/office/2006/relationships/vbaProject");
-	static const TCHAR* VbaData					=	_T("http://schemas.microsoft.com/office/2006/relationships/wordVbaData");
-	static const TCHAR* Toolbars				=	_T("http://schemas.microsoft.com/office/2006/relationships/attachedToolbars");
+    static const wchar_t* KeyMapCustomizations	=	L"http://schemas.microsoft.com/office/2006/relationships/keyMapCustomizations";
+    static const wchar_t* VbaProject			=	L"http://schemas.microsoft.com/office/2006/relationships/vbaProject";
+    static const wchar_t* VbaData				=	L"http://schemas.microsoft.com/office/2006/relationships/wordVbaData";
+    static const wchar_t* Toolbars				=	L"http://schemas.microsoft.com/office/2006/relationships/attachedToolbars";
 }

ASCOfficeDocFile/DocDocxConverter/ConversionContext.h

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

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

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

ASCOfficeDocFile/DocDocxConverter/Converter.h

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

ASCOfficeDocFile/DocDocxConverter/DateAndTime.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/DocumentMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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
 {
@@ -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.

ASCOfficeDocFile/DocDocxConverter/DocumentProperties.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/DocumentProperties.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/DocumentTypographyInfo.h

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

ASCOfficeDocFile/DocDocxConverter/DrawingObjectGrid.h

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

ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.cpp

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

ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.h

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

ASCOfficeDocFile/DocDocxConverter/EmuValue.h

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

ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -133,14 +133,25 @@ namespace DocFileFormat
 			pos = tStream.GetPosition();
 			
 		//------------------------------------------------------------------------------------------
-			crypt_data_aes.hashAlgorithm = CRYPT_METHOD::SHA1; //by AlgIDHash -> 0x0000 || 0x8004
-			crypt_data_aes.spinCount		= 50000;
+			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;
@@ -156,16 +167,11 @@ namespace DocFileFormat
 				break;
 			}
 
-			switch(ProviderType)
-			{
-			case 0x0001:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		break;
-			case 0x0018:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB; break;
-			}
-
-
+			//switch(ProviderType)
+			//{
+			//	case 0x0001:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		break;
+			//	case 0x0018:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB; break;
+			//}
 		}
-
-		//RELEASEARRAYOBJECTS( bytes );
 	}
-
 }

ASCOfficeDocFile/DocDocxConverter/EncryptionHeader.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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,8 @@ namespace DocFileFormat
         
 		EncryptionHeader( FileInformationBlock* fib, POLE::Stream* tableStream );
 	private:    
-		CRYPT::CryptRC4Data					crypt_data_rc4;
-		CRYPT::ECMADecryptor::_cryptData	crypt_data_aes;
-		bool								bStandard;
+		CRYPT::_rc4CryptData	crypt_data_rc4;
+		CRYPT::_ecmaCryptData	crypt_data_aes;
+		bool					bStandard;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/EndnoteDescriptor.h

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

ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -54,24 +54,24 @@ namespace DocFileFormat
 
 				int id = 0;
 
-				m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) );
-				m_pXmlWriter->WriteNodeBegin( _T( "w:endnotes" ), TRUE );
+                m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
+                m_pXmlWriter->WriteNodeBegin( L"w:endnotes", TRUE );
 
 				//write namespaces
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord );
-				m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships );
-				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
+                m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML );
+                m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
+                m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
+                m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
+                m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				int cp = ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn );
 
 				while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn + m_document->FIB->m_RgLw97.ccpEdn - 2 ) )
 				{
-					m_pXmlWriter->WriteNodeBegin( _T( "w:endnote" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id ));
-					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+                    m_pXmlWriter->WriteNodeBegin( L"w:endnote", TRUE );
+                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( id ));
+                    m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpAtn ) < (*m_document->IndividualEndnotesPlex)[id + 1] )
 					{
@@ -95,14 +95,14 @@ namespace DocFileFormat
 						}
 					}
 
-					m_pXmlWriter->WriteNodeEnd( _T( "w:endnote" ) );
+                    m_pXmlWriter->WriteNodeEnd( L"w:endnote");
 					id++;
 				}
 
-				m_pXmlWriter->WriteNodeEnd( _T( "w:endnotes" ) );
+                m_pXmlWriter->WriteNodeEnd( L"w:endnotes");
 
 				m_context->_docx->EndnotesXML = std::wstring( m_pXmlWriter->GetXmlString() );
 			}
 		}
 	};
-}
+}

ASCOfficeDocFile/DocDocxConverter/FieldCharacter.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/FileInformationBlock.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -507,9 +507,9 @@ namespace DocFileFormat
 	class FileInformationBlock
 	{
 	public:
-		bool					m_bOlderVersion;
-		int						m_CodePage;
-		FibBase					m_FibBase;
+		bool			m_bOlderVersion;
+		int				m_CodePage;
+		FibBase			m_FibBase;
 		
 		RgW97			m_RgW97;
 		RgLw97			m_RgLw97;
@@ -1189,9 +1189,9 @@ namespace DocFileFormat
 			m_FibBase.fDot				= FormatUtils::BitmaskToBool((int)flag16, 0x0001);
 			m_FibBase.fGlsy				= FormatUtils::BitmaskToBool((int)flag16, 0x0002);
 			m_FibBase.fComplex			= FormatUtils::BitmaskToBool((int)flag16, 0x0002);
-			m_FibBase.fHasPic				= FormatUtils::BitmaskToBool((int)flag16, 0x0008);
-			m_FibBase.cQuickSaves			= (WORD)(((int)flag16 & 0x00F0) >> 4);
-			m_FibBase.fEncrypted			= FormatUtils::BitmaskToBool((int)flag16, 0x0100);
+            m_FibBase.fHasPic			= FormatUtils::BitmaskToBool((int)flag16, 0x0008);
+            m_FibBase.cQuickSaves		= (WORD)(((int)flag16 & 0x00F0) >> 4);
+            m_FibBase.fEncrypted		= FormatUtils::BitmaskToBool((int)flag16, 0x0100);
 			m_FibBase.fWhichTblStm		= FormatUtils::BitmaskToBool((int)flag16, 0x0200);
 			m_FibBase.fReadOnlyRecommended	= FormatUtils::BitmaskToBool((int)flag16, 0x0400);
 			m_FibBase.fWriteReservation	= FormatUtils::BitmaskToBool((int)flag16, 0x0800);

ASCOfficeDocFile/DocDocxConverter/FixedPointNumber.h

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

ASCOfficeDocFile/DocDocxConverter/FontFamilyName.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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.h

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

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp

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

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.h

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

ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -45,16 +45,16 @@ namespace DocFileFormat
 		m_document = static_cast<WordDocument*>( visited );
 
 		//start the document
-		m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) );
-		m_pXmlWriter->WriteNodeBegin( _T( "w:ftr" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
+        m_pXmlWriter->WriteNodeBegin( L"w:ftr", TRUE );
 
 		//write namespaces
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships );
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+        m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
+        m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML );
+        m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
+        m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
+        m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 		//convert the footer text
 		_lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0];
@@ -93,8 +93,8 @@ namespace DocFileFormat
 			}
 		}
 
-		m_pXmlWriter->WriteNodeEnd( _T( "w:ftr" ) );
+        m_pXmlWriter->WriteNodeEnd( L"w:ftr" );
 
 		m_context->_docx->FooterXMLList.push_back( std::wstring( m_pXmlWriter->GetXmlString() ) );
 	}
-}
+}

ASCOfficeDocFile/DocDocxConverter/FooterMapping.h

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

ASCOfficeDocFile/DocDocxConverter/FootnoteDescriptor.h

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

ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h

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

ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp

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

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPage.h

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

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPageCHPX.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/FormattedDiskPagePAPX.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/FormattedDiskPagePAPX.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/Global.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/HeaderAndFooterTable.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/HeaderAndFooterTable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/HeaderMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -45,16 +45,16 @@ namespace DocFileFormat
 		m_document = static_cast<WordDocument*>( visited );
 
 		//start the document
-		m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) );
-		m_pXmlWriter->WriteNodeBegin( _T( "w:hdr" ), TRUE );
+        m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
+        m_pXmlWriter->WriteNodeBegin( L"w:hdr", TRUE );
 
 		//write namespaces
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord );
-		m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships );
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+        m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
+        m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML );
+        m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
+        m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
+        m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
+        m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 		//convert the header text
 		_lastValidPapx	=	(*(m_document->AllPapxFkps->begin()))->grppapx[0];
@@ -88,8 +88,8 @@ namespace DocFileFormat
 			}
 		}
 
-		m_pXmlWriter->WriteNodeEnd( _T( "w:hdr" ) );
+        m_pXmlWriter->WriteNodeEnd( L"w:hdr");
 
 		m_context->_docx->HeaderXMLList.push_back( std::wstring( m_pXmlWriter->GetXmlString() ) );
 	}
-}
+}

ASCOfficeDocFile/DocDocxConverter/HeaderMapping.h

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

ASCOfficeDocFile/DocDocxConverter/IBinaryReader.h

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

ASCOfficeDocFile/DocDocxConverter/IMapping.h

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

ASCOfficeDocFile/DocDocxConverter/IVisitable.h

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

ASCOfficeDocFile/DocDocxConverter/LanguageId.h

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

ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.cpp

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

ASCOfficeDocFile/DocDocxConverter/ListData.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/ListFormatOverride.h

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

ASCOfficeDocFile/DocDocxConverter/ListFormatOverrideLevel.h

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

ASCOfficeDocFile/DocDocxConverter/ListFormatOverrideTable.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/ListLevel.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/ListLevel.h

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

ASCOfficeDocFile/DocDocxConverter/ListTable.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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.h

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

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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 );
@@ -124,11 +123,14 @@ namespace DocFileFormat
 				TableInfo tai(papx);
 				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
 				{

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.h

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

ASCOfficeDocFile/DocDocxConverter/MemoryStream.h

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

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

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

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -52,9 +52,9 @@ namespace DocFileFormat
 
 	static const wchar_t LevelJustificationMap[3][7] =
 	{
-		_T("left"),
-		_T("center"),
-		_T("right")
+        L"left",
+        L"center",
+        L"right"
 	};
 
 	class NumberingMapping: public AbstractOpenXmlMapping, public IMapping
@@ -89,4 +89,4 @@ namespace DocFileFormat
 		WordDocument*			m_document;
 		WordprocessingDocument*	m_xmldocument;	
 	};
-}
+}

ASCOfficeDocFile/DocDocxConverter/OfficeArtContent.h

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2016
+ * (c) Copyright Ascensio System SIA 2010-2017
  *
  * This program 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/BitmapBlip.h

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

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreContainer.h

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

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreEntry.h

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

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ChildAnchor.h

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

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientAnchor.h

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

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ClientData.h

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

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DiagramBooleanProperties.h

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

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingContainer.h

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

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/DrawingGroup.h

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