fix docxrenderer enum set

Feature/docx renderer

.gitignore

@@ -1,41 +1,4 @@
 build/
-dictionaries/
-LicenceManager/
-Common/boost_1_58_0
-Common/3dParty/boost/boost_1_58_0
-Common/3dParty/boost/boost.data
-Common/3dParty/boost/ios
-Common/3dParty/boost/osx
-Common/3dParty/icu/icu
-Common/3dParty/icu/win_64
-Common/3dParty/icu/win_32
-Common/3dParty/icu/linux_64
-Common/3dParty/icu/linux_32
-Common/3dParty/icu/mac_64
-Common/3dParty/icu/ios
-Common/3dParty/icu/android
-Common/3dParty/icu/mac-build
-Common/3dParty/cef/win_64
-Common/3dParty/cef/win_32
-Common/3dParty/cef/linux_64
-Common/3dParty/cef/linux_32
-Common/3dParty/cef/mac_64
-Common/3dParty/curl/win_64
-Common/3dParty/curl/win_32
-Common/3dParty/curl/linux_64
-Common/3dParty/curl/linux_32
-Common/3dParty/curl/mac_64
-Common/3dParty/v8/.cipd
-Common/3dParty/v8/.gclient
-Common/3dParty/v8/.gclient_entries
-Common/3dParty/v8/v8
-Common/3dParty/v8/depot_tools
-Common/3dParty/v8/win_64
-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
@@ -50,15 +13,7 @@ Thumbs.db
 *.xcuserstate
 *.xcuserdatad
 **/Makefile.*
-ASCOfficeXlsFile2/win32/_ASCOfficeXlsFile2.idl
-ASCOfficeXlsFile2/win32/_ASCOfficeXlsFile2.tlb
-ASCOfficeXlsFile2/win32/_ASCOfficeXlsFile2.h
-ASCOfficeXlsFile2/win32/_ASCOfficeXlsFile2_i.c
-ASCOfficeXlsFile2/win32/_ASCOfficeXlsFile2_p.c
-ASCOfficeXlsFile2/win32/dlldata.c
-OfficeUtils/win32/OfficeUtilsLib/OfficeUtilsLib/ReadMe.txt
-X2tConverter/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/Makefile
-X2tConverter/Common/DocxFormat/DocxFormatLib/Makefile
+**/Makefile
 *.7z
 *.obj
 *.pdb
@@ -71,3 +26,17 @@ X2tConverter/Common/DocxFormat/DocxFormatLib/Makefile
 *.dat
 *.txt
 *.log
+
+*.ipch
+*.ipch
+*.ipch
+
+*.db-wal
+
+*.db-shm
+
+*.db
+
+*.opendb
+
+DesktopEditor/fontengine/js/common/freetype-2.10.4

ASCOfficeDocFile/Common/FormatUtils.h

@@ -100,9 +100,6 @@ namespace DocFileFormat
 
 	typedef std::pair <int, int> Int_Pair;
 
-	static const int gc_nZeroWidth = 222;
-
-
 #define ENCODING_UTF16			1200
 #define ENCODING_WINDOWS_1250	1250
 #define ENCODING_UTF8			65001

ASCOfficeDocFile/Common/XmlTools.h

@@ -32,7 +32,7 @@
 #pragma once
 
 #include <string>
-#include <map>
+#include <unordered_map>
 #include <list>
 
 #include <boost/shared_ptr.hpp>
@@ -123,15 +123,15 @@ namespace XMLTools
 	private:
         std::wstring									m_Name;
         std::wstring									m_ElementText;
-        std::map<std::wstring, std::wstring>            m_AttributeMap;
-        std::map<std::wstring, int>						m_ChildMap; //for uniq
+        std::unordered_map<std::wstring, std::wstring>	m_AttributeMap;
+        std::unordered_map<std::wstring, int>			m_ChildMap; //for uniq
         std::list<XMLElement>                           m_Elements;
 
         typedef std::list<XMLElement>::iterator          ElementsIterator;
         typedef std::list<XMLElement>::const_iterator    ElementsIteratorConst;
 
-        typedef std::map<std::wstring, std::wstring>::iterator            AttMapIterator;
-        typedef std::map<std::wstring, std::wstring>::const_iterator      AttMapIteratorConst;
+        typedef std::unordered_map<std::wstring, std::wstring>::iterator            AttMapIterator;
+        typedef std::unordered_map<std::wstring, std::wstring>::const_iterator      AttMapIteratorConst;
 
     public:
 

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

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

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -55,7 +55,6 @@ namespace DocFileFormat
 			{
 				m_context->_docx->RegisterComments();
 
-                m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
                 m_pXmlWriter->WriteNodeBegin( L"w:comments", TRUE );
 
                 m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
@@ -148,7 +147,6 @@ namespace DocFileFormat
 				{
 					m_context->_docx->RegisterCommentsExtended();
 
-					m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
 					m_pXmlWriter->WriteNodeBegin( L"w15:commentsEx", TRUE );
 
 					m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

@@ -61,7 +61,7 @@ namespace DocFileFormat
 
 namespace DocFileFormat
 {
-	_UINT32 Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
+	_UINT32 Converter::Convert(WordDocument* doc, WordprocessingDocument* docx)
 	{
 		if (!doc || !docx) return S_FALSE;
 		
@@ -81,21 +81,9 @@ namespace DocFileFormat
 		}
 
 		//write document.xml and the header and footers
-		MainDocumentMapping mainDocMapping( &context, progress );
+		MainDocumentMapping mainDocMapping( &context);
 		doc->Convert( &mainDocMapping );
 
-		if ( progress != NULL )
-		{
-			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 810000 );
-
-			short cancel = 0;
-			progress->OnProgressEx( progress->caller, DOC_ONPROGRESSEVENT_ID, 810000, &cancel );
-
-			if ( cancel != 0 )
-			{
-				return S_FALSE;
-			}
-		}
 	//Write numbering.xml
 		if (doc->listTable)
 		{
@@ -103,129 +91,42 @@ namespace DocFileFormat
 			doc->listTable->Convert( &numberingMapping );
 		}
 
-		if ( progress != NULL )
-		{
-			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 850000 );
-
-			short cancel = 0;
-			progress->OnProgressEx( progress->caller, DOC_ONPROGRESSEVENT_ID, 850000, &cancel );
-
-			if ( cancel != 0 )
-			{
-				return S_FALSE;
-			}
-		}
-		if ( progress != NULL )
-		{
-			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 875000 );
-
-			short cancel = 0;
-			progress->OnProgressEx( progress->caller, DOC_ONPROGRESSEVENT_ID, 875000, &cancel );
-
-			if ( cancel != 0 )
-			{
-				return S_FALSE;
-			}
-		}
-
 	//write the footnotes
 		FootnotesMapping footnotesMapping( &context );
 		doc->Convert( &footnotesMapping );
 
-		if ( progress != NULL )
-		{
-			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 900000 );
-
-			short cancel = 0;
-			progress->OnProgressEx( progress->caller, DOC_ONPROGRESSEVENT_ID, 900000, &cancel );
-
-			if ( cancel != 0 )
-			{
-				return S_FALSE;
-			}
-		}
-
 	//write the endnotes
 		EndnotesMapping endnotesMapping( &context );
 		doc->Convert( &endnotesMapping );
 
-		if ( progress != NULL )
-		{
-			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 925000 );
-
-			short cancel = 0;
-			progress->OnProgressEx( progress->caller, DOC_ONPROGRESSEVENT_ID, 925000, &cancel );
-
-			if ( cancel != 0 )
-			{
-				return S_FALSE;
-			}
-		}
-
 	//write the comments
 		CommentsMapping commentsMapping( &context );
 		doc->Convert( &commentsMapping );
 
-		if ( progress != NULL )
-		{
-			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 950000 );
-
-			short cancel = 0;
-			progress->OnProgressEx( progress->caller, DOC_ONPROGRESSEVENT_ID, 950000, &cancel );
-
-			if ( cancel != 0 )
-			{
-				return S_FALSE;
-			}
-		}
-
 	//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 );
-
-			short cancel = 0;
-			progress->OnProgressEx( progress->caller, DOC_ONPROGRESSEVENT_ID, 975000, &cancel );
-
-			if ( cancel != 0 )
-			{
-				return S_FALSE;
-			}
-		}
 
 		return S_OK;
 	}
 
-	_UINT32 Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
+	_UINT32 Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, bool &bMacros)
 	{
-		WordDocument			doc(progress, m_sTempFolder, m_nUserLCID);
+		WordDocument			doc(m_sTempFolder, m_nUserLCID);
 		WordprocessingDocument	docx(strDstDirectory, &doc);
 		
 		_UINT32 result = doc.LoadDocument(strSrcFile, password);
 
         if (result == 0)
 		{
-			result = Convert(&doc, &docx, progress);
+			result = Convert(&doc, &docx);
 
             if (result == 0)
 			{
-				docx.SaveDocument(bMacros);
-
-                if (progress)progress->OnProgress(progress->caller, DOC_ONPROGRESSEVENT_ID, 1000000);
-
-				short cancel = 0;
-                if (progress)progress->OnProgressEx(progress->caller, DOC_ONPROGRESSEVENT_ID, 1000000, &cancel);
-
-				if (0 != cancel)
-				{
-					return S_FALSE;
-				}
+				result = docx.SaveDocument(bMacros);
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/Converter.h

@@ -34,8 +34,6 @@
 #include <string>
 #include "../../Common/DocxFormat/Source/Base/Types_32.h"
 
-struct ProgressCallback;
-
 namespace DocFileFormat
 {
 	class WordDocument;
@@ -50,9 +48,9 @@ namespace DocFileFormat
 		std::wstring m_sTempFolder;
 		int m_nUserLCID;
 
-		_UINT32 LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
+		_UINT32 LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, bool &bMacros);
 	
 	private:
-		_UINT32 Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	
+		_UINT32 Convert(WordDocument* doc, WordprocessingDocument* docx);	
 	};
 }

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -52,9 +52,9 @@ namespace DocFileFormat
 		m_bInternalXmlWriter	=	false;
 
 		_writeWebHidden			=	false;
-		_isSectionPageBreak		=	0;
 		_isTextBoxContent		=	false;
 
+		m_context->_docx->_isSectionPageBreak =	0;
 //--------------------------------------------
 		_embeddedObject			=	false;
 	}
@@ -68,11 +68,12 @@ namespace DocFileFormat
 		m_bInternalXmlWriter	=	false;
 	
 		_writeWebHidden			=	false;
-		_isSectionPageBreak		=	0;
 		_isTextBoxContent		=	false;
 		_embeddedObject			=	false;
 
 		_cacheListNum			= -1;
+		
+		m_context->_docx->_isSectionPageBreak =	0;
 	}
 
 	DocumentMapping::~DocumentMapping()
@@ -115,7 +116,7 @@ namespace DocFileFormat
 		{
 			if ((fc >= m_document->ListPlex->CharacterPositions[i-1]) && (fc_end <= m_document->ListPlex->CharacterPositions[i]))
 			{
-				ListNumCache* listNum = dynamic_cast<ListNumCache*> (m_document->ListPlex->Elements[i-1]);
+				ListNumCache* listNum = dynamic_cast<ListNumCache*> (m_document->ListPlex->Elements[i - 1]);
 
 				return listNum->value;
 			}
@@ -233,7 +234,7 @@ namespace DocFileFormat
 		}
 //-----------------------------------------------------------		
 		//_cacheListNum		= getListNumCache(fc, fcEnd);
-		_isSectionPageBreak = 0;
+		m_context->_docx->_isSectionPageBreak = 0;
 		if (sectionEnd)
 		{
 			// this is the last paragraph of this section
@@ -244,7 +245,7 @@ namespace DocFileFormat
 				ParagraphPropertiesMapping oMapping(m_pXmlWriter, m_context, m_document, paraEndChpx, isBidi, findValidSepx(cpEnd), _sectionNr);
 				papx->Convert(&oMapping);
 
-				_isSectionPageBreak = oMapping.get_section_page_break();
+				m_context->_docx->_isSectionPageBreak = oMapping.get_section_page_break();
 			}
 
 			++_sectionNr;
@@ -360,8 +361,10 @@ namespace DocFileFormat
 
 		RELEASEOBJECT(chpxFcs);
 		RELEASEOBJECT(chpxs);
-
+		
 		return cpEnd++;
+
+		return (std::max)(cp, cpEnd); //ralph_scovile.doc
 	}
 
 	void DocumentMapping::writeParagraphRsid (const ParagraphPropertyExceptions* papx)
@@ -515,6 +518,7 @@ namespace DocFileFormat
         std::wstring PAGEREF	( L"PAGEREF" );
         std::wstring PAGE		( L"PAGE" );
         std::wstring SHAPE		( L"SHAPE" );
+		std::wstring NREF		( L"NREF");
 
 		if (arField.empty() == false)
 			f = arField[0];
@@ -535,8 +539,9 @@ namespace DocFileFormat
 		bool bEquation		= search( f.begin(), f.end(), Equation.begin(),		Equation.end())			!= f.end();
 		bool bPAGE			= search( f.begin(), f.end(), PAGE.begin(),			PAGE.end())				!= f.end();
 		bool bTOC			= search( f.begin(), f.end(), TOC.begin(),			TOC.end())				!= f.end();
-		bool bSHAPE			= search( f.begin(), f.end(), SHAPE.begin(),		SHAPE.end())				!= f.end();
-		
+		bool bSHAPE			= search( f.begin(), f.end(), SHAPE.begin(),		SHAPE.end())			!= f.end();
+		bool bNREF			= search( f.begin(), f.end(), NREF.begin(),			NREF.end())				!= f.end();
+
 		bool bPAGEREF = false; 
 		if (bHYPERLINK && arField.size() > 1)
 		{
@@ -823,9 +828,9 @@ namespace DocFileFormat
 			}
 			else if (TextMark::PageBreakOrSectionMark == code)
 			{
-				if (_isSectionPageBreak == 0 || _isSectionPageBreak == 2)
+				if (m_context->_docx->_isSectionPageBreak == 0 || m_context->_docx->_isSectionPageBreak == 2)
 				{
-					_isSectionPageBreak = -1;
+					m_context->_docx->_isSectionPageBreak = -1;
 
                     writeTextElement(text, textType);
 
@@ -914,22 +919,26 @@ namespace DocFileFormat
 
 				//<w:sym w:font="Symbol" w:char="F062"/>
 
-                m_pXmlWriter->WriteNodeBegin(L"w:sym", true);
-                m_pXmlWriter->WriteAttribute(L"w:font", FormatUtils::XmlEncode(s.FontName));
-                m_pXmlWriter->WriteAttribute(L"w:char", FormatUtils::XmlEncode(s.HexValue));
-                m_pXmlWriter->WriteNodeEnd(L"", true);
+				if (false == s.HexValue.empty()) //09FluGuide.doc - поврежденный
+				{
+					m_pXmlWriter->WriteNodeBegin(L"w:sym", true);
+					if (false == s.FontName.empty()) // ??? default
+						m_pXmlWriter->WriteAttribute(L"w:font", FormatUtils::XmlEncode(s.FontName));
+					m_pXmlWriter->WriteAttribute(L"w:char", FormatUtils::XmlEncode(s.HexValue));
+					m_pXmlWriter->WriteNodeEnd(L"", true);
+				}
 			}
 			else if ((TextMark::DrawnObject == code) && fSpec)
 			{
-				Spa* pSpa	=	NULL;
+				Spa* pSpa =	NULL;
 				if (typeid(*this) == typeid(MainDocumentMapping))
 				{
-					pSpa	=	static_cast<Spa*>(m_document->OfficeDrawingPlex->GetStruct(cp));
+					pSpa = static_cast<Spa*>(m_document->OfficeDrawingPlex->GetStruct(cp));
 				}
 				else if ((typeid(*this) == typeid(HeaderMapping) ) || ( typeid(*this) == typeid(FooterMapping)))
 				{
-					int headerCp	=	( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn );
-					pSpa	=	static_cast<Spa*>(m_document->OfficeDrawingPlexHeader->GetStruct(headerCp));
+					int headerCp = ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn );
+					pSpa = static_cast<Spa*>(m_document->OfficeDrawingPlexHeader->GetStruct(headerCp));
 				}
 
 				bool bPicture = false;
@@ -1303,7 +1312,7 @@ namespace DocFileFormat
 		
 		TableInfo tai( papx, m_document->nWordVersion );
 
-		//build the table grid
+	//build the table grid
 		std::vector<short> grid;
 		buildTableGrid( cp, nestingLevel, grid);
 
@@ -1380,9 +1389,9 @@ namespace DocFileFormat
 		
 		while ( tai.fInTable )
 		{
-			iTap_current = 1;
+			fEndNestingLevel = false;
 
-			for ( std::list<SinglePropertyModifier>::iterator iter = papx->grpprl->begin(); iter != papx->grpprl->end(); iter++ )
+			for ( std::list<SinglePropertyModifier>::iterator iter = papx->grpprl->begin(); !fEndNestingLevel && iter != papx->grpprl->end(); iter++ )
 			{
 				DWORD code = iter->OpCode;
 
@@ -1391,7 +1400,7 @@ namespace DocFileFormat
 					case sprmPFInnerTableCell:
 					case sprmPFInnerTtp:
 					{
-						fEndNestingLevel = ( iter->Arguments[0] == 1 ) ? (true) : (false);
+						fEndNestingLevel = ( iter->Arguments[0] == 1 && (nestingLevel == iTap_current)) ? (true) : (false);
 					}break;
 
 					case sprmOldPFInTable:
@@ -1424,19 +1433,9 @@ namespace DocFileFormat
 								boundary1 = FormatUtils::BytesToInt16( iter->Arguments + 1, i * 2 , iter->argumentsSize );
 								boundary2 = FormatUtils::BytesToInt16( iter->Arguments + 1, ( i + 1 ) * 2, iter->argumentsSize );
 
-								//if (boundary1 < 0) boundary1 = 0;
-								//if (boundary2 < 0) boundary2 = 0;
-
 								mapBoundaries.insert(std::make_pair(boundary1, 0));
 								mapBoundaries.insert(std::make_pair(boundary2, 0));
-								//AddBoundary(boundary1, boundary2, mapBoundaries);
 							}
-							if (max_boundary < boundary2)
-								max_boundary = boundary2;
-
-							mapBoundaries.insert(std::make_pair(boundary2, 0));
-							mapBoundaries.insert(std::make_pair(max_boundary, 0));
-							//AddBoundary(boundary2, max_boundary, mapBoundaries);
 							bPresent = true;
 						}break;
 						default:
@@ -1444,9 +1443,9 @@ namespace DocFileFormat
 					}
 				}
 			}
-			if (nestingLevel != iTap_current && fEndNestingLevel && !mapBoundaries.empty())
+			if ((nestingLevel != iTap_current || fEndNestingLevel) && !mapBoundaries.empty())
 				break;
-			//get the next papx
+	//get the next papx
 			papx = findValidPapx( fcRowEnd );
 			tai = TableInfo( papx, m_document->nWordVersion );
 			fcRowEnd = findRowEndFc( cp, cp, nestingLevel );
@@ -1466,7 +1465,7 @@ namespace DocFileFormat
 			{
 				int sz = it_next->first - it->first;
 				if (sz > 2)
-					grid.push_back( it_next->first - it->first );
+					grid.push_back(it_next->first - it->first);
 			}
 		}
 		_lastValidPapx = backup;
@@ -1788,7 +1787,11 @@ namespace DocFileFormat
 	{
 		if ((m_document->FootnoteReferenceCharactersPlex != NULL) && (m_document->FootnoteReferenceCharactersPlex->IsCpExists(cp)))
 		{
-			FootnoteDescriptor* desc = dynamic_cast<FootnoteDescriptor*>(m_document->FootnoteReferenceCharactersPlex->Elements[_footnoteNr]);
+			FootnoteDescriptor* desc = NULL;
+			
+			if (_footnoteNr < m_document->FootnoteReferenceCharactersPlex->Elements.size())
+				desc = dynamic_cast<FootnoteDescriptor*>(m_document->FootnoteReferenceCharactersPlex->Elements[_footnoteNr]);
+			
 			if ((desc) && (false == desc->bUsed))
 			{
 				desc->bUsed = true;

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -154,7 +154,7 @@ namespace DocFileFormat
 		int								_endnoteNr;
 		int								_commentNr;
 		bool							_isTextBoxContent;
-		int								_isSectionPageBreak; //0 - not set, 1 -page break, 2 - continues, -1 - already
+//		int								_isSectionPageBreak; //0 - not set, 1 -page break, 2 - continues, -1 - already
 		bool							_writeWebHidden;
 		std::wstring					_writeAfterRun;
 		std::wstring					_lastOLEObject;

ASCOfficeDocFile/DocDocxConverter/DocumentProperties.cpp

@@ -444,40 +444,50 @@ namespace DocFileFormat
 									rsidRoot = FormatUtils::BytesToInt32(bytes, 588, size);
 									//unused 2
 
-									if (size > 594 && size > 609) //start && stop bound /* && fib->m_FibNew.nFibNew > Fib2002*/
+									if (size > 594 && size > 609)
 									{
-										//split bytes 592,593,594,595 into bits
-										fTreatLockAtnAsReadOnly = FormatUtils::GetBitFromBytes((bytes + 592), 4, 0);
-										fStyleLock = FormatUtils::GetBitFromBytes((bytes + 592), 4, 1);
-										fAutoFmtOverride = FormatUtils::GetBitFromBytes((bytes + 592), 4, 2);
-										fRemoveWordML = FormatUtils::GetBitFromBytes((bytes + 592), 4, 3);
-										fApplyCustomXForm = FormatUtils::GetBitFromBytes((bytes + 592), 4, 4);
-										fStyeLockEnforced = FormatUtils::GetBitFromBytes((bytes + 592), 4, 5);
-										fFakeLockAtn = FormatUtils::GetBitFromBytes((bytes + 592), 4, 6);
-										fIgnoreMixedContent = FormatUtils::GetBitFromBytes((bytes + 592), 4, 7);
-										fShowPlaceholderText = FormatUtils::GetBitFromBytes((bytes + 592), 4, 8);
-										grf = FormatUtils::GetUIntFromBytesBits((bytes + 592), 4, 9, 23);
+										const size_t dop2003_offset = 594;
 
-										//split bytes 596 and 597 into bits
-										fReadingModeInkLockDown = FormatUtils::GetBitFromBytes((bytes + 596), 2, 0);
-										fAcetateShowInkAtn = FormatUtils::GetBitFromBytes((bytes + 596), 2, 1);
-										fFilterDttm = FormatUtils::GetBitFromBytes((bytes + 596), 2, 2);
-										fEnforceDocProt = FormatUtils::GetBitFromBytes((bytes + 596), 2, 3);
-										iDocProtCur = (unsigned short)FormatUtils::GetUIntFromBytesBits((bytes + 596), 2, 4, 3);
-										fDispBkSpSaved = FormatUtils::GetBitFromBytes((bytes + 596), 2, 7);
+										_UINT32 flags = FormatUtils::BytesToUInt32(bytes, dop2003_offset, size);
+										fTreatLockAtnAsReadOnly = GETBIT(flags, 0);
+										fStyleLock = GETBIT(flags, 1);
+										fAutoFmtOverride = GETBIT(flags, 2);
+										fRemoveWordML = GETBIT(flags, 3);
+										fApplyCustomXForm = GETBIT(flags, 4);
+										fStyeLockEnforced = GETBIT(flags, 5);
+										fFakeLockAtn = GETBIT(flags, 6);
+										fIgnoreMixedContent = GETBIT(flags, 7);
+										fShowPlaceholderText = GETBIT(flags, 8);
+										bool unused = GETBIT(flags, 9);
+										fWord97Doc = GETBIT(flags, 10);
+										fStyleLockTheme = GETBIT(flags, 11);
+										fStyleLockQFSet = GETBIT(flags, 12);
+										//empty = 19
 
-										dxaPageLock = FormatUtils::BytesToInt16(bytes, 598, size);
-										dyaPageLock = FormatUtils::BytesToInt16(bytes, 600, size);
-										pctFontLock = FormatUtils::BytesToInt32(bytes, 602, size);
-										grfitbid = bytes[606];
-										//unsigned char 607 is unused
-										ilfoMacAtCleanup = FormatUtils::BytesToUInt16(bytes, 608, size);
+										BYTE flags2 = bytes[dop2003_offset + 4];
+										fReadingModeInkLockDown = GETBIT(flags2, 0);
+										fAcetateShowInkAtn = GETBIT(flags2, 1);
+										fFilterDttm = GETBIT(flags2, 2);
+										fEnforceDocProt = GETBIT(flags2, 3);
+										iDocProtCur = GETBITS(flags2, 4, 6);
+										fDispBkSpSaved = GETBIT(flags2, 7);
+
+										//empty2 = 8
+										dxaPageLock = FormatUtils::BytesToInt32(bytes, dop2003_offset + 6, size);
+										dyaPageLock = FormatUtils::BytesToInt32(bytes, dop2003_offset + 10, size);
+										pctFontLock = FormatUtils::BytesToInt32(bytes, dop2003_offset + 14, size);
+										
+										grfitbid = bytes[dop2003_offset + 18];
+										//empty3  = 8
+										ilfoMacAtCleanup = FormatUtils::BytesToUInt16(bytes, dop2003_offset + 20, size);
 
 										if (size > 616 && size > 621) //start && stop bound /* && fib->m_FibNew.nFibNew > Fib2003*/
 										{
+											const size_t dop2007_offset = 616;
+
 											//4 bytes reserved
-											bool fRMTrackFormatting = FormatUtils::GetBitFromBytes((bytes + 620), 2, 0);
-											bool fRMTrackMoves = FormatUtils::GetBitFromBytes((bytes + 620), 2, 1);
+											bool fRMTrackFormatting = FormatUtils::GetBitFromBytes((bytes + dop2007_offset + 4), 2, 0);
+											bool fRMTrackMoves = FormatUtils::GetBitFromBytes((bytes + dop2007_offset + 4), 2, 1);
 											//dopMth  = 34 bytes from 624 = 658
 
 											if (size > 674/* && fib->m_FibNew.nFibNew > Fib2007*/)
@@ -799,13 +809,12 @@ namespace DocFileFormat
       fFakeLockAtn = false;
       fIgnoreMixedContent = false;
       fShowPlaceholderText = false;
-      grf = 0;
       fReadingModeInkLockDown = false;
       fAcetateShowInkAtn = false;
       fFilterDttm = false;
       fEnforceDocProt = false;
       iDocProtCur = 0;
-      fDispBkSpSaved = true;
+      fDispBkSpSaved = false;
       dxaPageLock = 0;
       dyaPageLock = 0;
       pctFontLock = 0;

ASCOfficeDocFile/DocDocxConverter/DocumentProperties.h

@@ -570,7 +570,11 @@ namespace DocFileFormat
 		bool fIgnoreMixedContent;
         // XML Option: Show placeholder text for all empty XML elements
 		bool fShowPlaceholderText;
-		unsigned int grf;
+
+		bool fWord97Doc = false;
+		bool fStyleLockTheme = false;
+		bool fStyleLockQFSet = false;
+
         // Reading mode: ink lock down
 		bool fReadingModeInkLockDown;
         // Track changes: Show ink annotations
@@ -587,9 +591,9 @@ namespace DocFileFormat
 		unsigned short iDocProtCur;
 		bool fDispBkSpSaved;
         // Reading Layout page size lockdown
-		short dxaPageLock;
+		int dxaPageLock;
         // Reading Layout page size lockdown
-		short dyaPageLock;
+		int dyaPageLock;
         // Reading Layout font lockdown
 		int pctFontLock;
 		unsigned char grfitbid;

ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h

@@ -54,7 +54,6 @@ namespace DocFileFormat
 
 				int id = 0;
 
-                m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
                 m_pXmlWriter->WriteNodeBegin( L"w:endnotes", TRUE );
 
 				//write namespaces

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp

@@ -52,7 +52,6 @@ namespace DocFileFormat
 
 		_ctx->_docx->RegisterFontTable();
 
-        m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
         m_pXmlWriter->WriteNodeBegin( L"w:fonts", TRUE );
         m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
         m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );

ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp

@@ -45,7 +45,6 @@ namespace DocFileFormat
 		m_document = static_cast<WordDocument*>( visited );
 
 		//start the document
-        m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
         m_pXmlWriter->WriteNodeBegin( L"w:ftr", TRUE );
 
 		//write namespaces

ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h

@@ -54,7 +54,6 @@ namespace DocFileFormat
 
 				int id = 0;
 
-                m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
                 m_pXmlWriter->WriteNodeBegin( L"w:footnotes", TRUE );
 
 				//write namespaces

ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp

@@ -45,7 +45,6 @@ namespace DocFileFormat
 		m_document = static_cast<WordDocument*>( visited );
 
 		//start the document
-        m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
         m_pXmlWriter->WriteNodeBegin( L"w:hdr", TRUE );
 
 		//write namespaces

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp

@@ -34,9 +34,8 @@
 
 namespace DocFileFormat
 {
-	MainDocumentMapping::MainDocumentMapping (ConversionContext* ctx, const ProgressCallback* ffCallBack) : DocumentMapping( ctx, this ), m_ffCallBack(NULL)
+	MainDocumentMapping::MainDocumentMapping (ConversionContext* ctx) : DocumentMapping( ctx, this )
 	{
-		m_ffCallBack	=	ffCallBack;
 	}
 
 	MainDocumentMapping::~MainDocumentMapping()
@@ -52,7 +51,6 @@ namespace DocFileFormat
 		m_document = static_cast<WordDocument*>(visited);
 		
 		// Header
-		m_pXmlWriter->WriteNodeBegin(L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
 		m_pXmlWriter->WriteNodeBegin(L"w:document", TRUE );
 
 		// Namespaces
@@ -168,24 +166,6 @@ namespace DocFileFormat
 
 				cp = m_document->FIB->m_RgLw97.ccpText;
 			}
-
-			if (m_ffCallBack)
-			{
-				if (( (unsigned int) cp > (progressStep * index)  ) && (m_ffCallBack))
-				{
-					double progress = ( double( 800000 - 500000 ) / m_document->FIB->m_RgLw97.ccpText * cp );
-
-					m_ffCallBack->OnProgress (m_ffCallBack->caller, DOC_ONPROGRESSEVENT_ID, long( 500000 + progress ));
-
-					short bCancel = 0;
-					m_ffCallBack->OnProgressEx (m_ffCallBack->caller, DOC_ONPROGRESSEVENT_ID, long( 500000 + progress ), &bCancel);
-
-					if (0 != bCancel)
-						return;
-
-					++index;
-				}
-			}
 		}
 
 		//write the section properties of the body with the last SEPX

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.h

@@ -41,12 +41,9 @@ namespace DocFileFormat
 	class MainDocumentMapping : public DocumentMapping
 	{
 	public:
-		MainDocumentMapping (ConversionContext* ctx, const ProgressCallback* ffCallBack);
+		MainDocumentMapping (ConversionContext* ctx);
 		virtual ~MainDocumentMapping();
+		
 		virtual void Apply (IVisitable* visited);
-
-	private:
-
-		const ProgressCallback* m_ffCallBack;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/MemoryStream.h

@@ -197,6 +197,9 @@ public:
 
     virtual int Seek (int offset, int origin = 0/*STREAM_SEEK_SET*/)
 	{
+		if (origin == 2) offset = m_Position + offset;
+		if (origin == 1) offset = m_Size - offset;
+
 		if ( (m_Data != NULL) && (offset >= 0) && ((unsigned int)offset < m_Size) )
 			return m_Position = offset;
 

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -63,7 +63,6 @@ namespace DocFileFormat
 			m_xmldocument->RegisterNumbering();
 
 			//start the document
-            m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
             m_pXmlWriter->WriteNodeBegin( L"w:numbering", TRUE );
 
 			//write namespaces

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/OfficeArtClientTextbox.h

@@ -40,7 +40,7 @@ namespace DocFileFormat
 	public:
 		static const unsigned short TYPE_CODE_0xF00D = 0xF00D;
 
-		OfficeArtClientTextbox () : Record(), m_nIndex(0)
+		OfficeArtClientTextbox () : Record()
 		{
 
 		}
@@ -50,24 +50,15 @@ namespace DocFileFormat
 			unsigned int number	=	Reader->ReadUInt16();
 			m_nIndex			=	Reader->ReadUInt16();
 		}
-
 		virtual ~OfficeArtClientTextbox()
 		{
 
 		}
-
 		virtual Record* NewObject(IBinaryReader* reader, unsigned int bodySize, unsigned int typeCode, unsigned int version, unsigned int instance)
 		{
 			return new OfficeArtClientTextbox(reader, bodySize, typeCode, version, instance);
 		}
 
-		inline int GetIndex ()
-		{
-			return m_nIndex;
-		}
-
-	public:
-
-		int	m_nIndex;
+		int	m_nIndex = 0;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -108,6 +108,8 @@ namespace DocFileFormat
 			std::wstring pathFileName = outputDir + FILE_SEPARATOR_STR + fileName;
 			if (file.CreateFileW(pathFileName))
 			{
+				std::string root = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>";
+				file.WriteFile((BYTE*)root.c_str(), root.length());
 				file.WriteStringUTF8(XMLContent);
 				file.CloseFile();
 			}
@@ -397,7 +399,6 @@ namespace DocFileFormat
 		{
 			XMLTools::CStringXmlWriter writer;
 
-            writer.WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
             writer.WriteNodeBegin( L"Relationships", TRUE );
 
 			//write namespaces
@@ -433,7 +434,6 @@ namespace DocFileFormat
 		XMLTools::CStringXmlWriter writer;
 
 		// write content types
-        writer.WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
         writer.WriteNodeBegin( L"Types", TRUE );
 
 		//write namespaces

ASCOfficeDocFile/DocDocxConverter/PieceTable.cpp

@@ -393,8 +393,15 @@ namespace DocFileFormat
 				//read from pcd.fc to fcEnd
 
 				int cb = fcEnd - (int)pcd.fc;
-				if (cb <= 0)
-					break;				
+				if (cb == 0) //ralph_scovile.doc
+				{
+					if (pcd.cpEnd - pcd.cpStart < 2) // com2010_0624pl01.doc
+						cb = pcdFcEnd - (int)pcd.fc; 
+					if (cb <= 0)
+						break;
+				}
+				else if (cb < 0)
+					break;
 
 				if (!ReadSymbolsBuffer((int)pcd.fc, cb, pcd.code_page, word, encodingChars))
 					break;

ASCOfficeDocFile/DocDocxConverter/PropertiesMapping.cpp

@@ -439,15 +439,15 @@ namespace DocFileFormat
             val.SetValue( getBorderType( brc->brcType ));
 			border->AppendAttribute( val );
 
-            XMLTools::XMLAttribute color( L"w:color" );
-            color.SetValue( RGBColor( brc->cv, RedFirst ).SixDigitHexCode);
-			border->AppendAttribute( color );
-
-            XMLTools::XMLAttribute space( L"w:space" , FormatUtils::IntToWideString( brc->dptSpace ));
-			border->AppendAttribute( space );
-
             XMLTools::XMLAttribute sz( L"w:sz", FormatUtils::IntToWideString( brc->dptLineWidth ));
 			border->AppendAttribute( sz );
+           
+            XMLTools::XMLAttribute space( L"w:space" , FormatUtils::IntToWideString( brc->dptSpace ));
+			border->AppendAttribute( space );
+			
+			XMLTools::XMLAttribute color( L"w:color" );
+            color.SetValue( RGBColor( brc->cv, RedFirst ).SixDigitHexCode);
+			border->AppendAttribute( color );
 
 			if ( brc->fShadow )
 			{

ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.cpp

@@ -108,7 +108,7 @@ namespace DocFileFormat
 				switch (iter->OpCode)
 				{
 					case sprmOldSGprfIhdt:
-					case sprmSGprfIhdt:
+					//case sprmSGprfIhdt: //betesil_pl_it.doc
 					{
 						fHF = FormatUtils::BytesToUChar( iter->Arguments, 0, iter->argumentsSize );
 					}break;
@@ -162,6 +162,7 @@ namespace DocFileFormat
 		//MUST be ignored if the section does not have page number restart enabled.([MS-DOC] — v20101113. стр 152)
 		bool bWasSprmSFPgnRestart = false;
 		std::wstring wsSprmSPgnStart;
+		int nProperty = 0; // for unknown
 
 		for (std::list<SinglePropertyModifier>::iterator iter = sepx->grpprl->begin(); iter != sepx->grpprl->end(); ++iter)
 		{
@@ -474,9 +475,14 @@ namespace DocFileFormat
 				break;
 
 			default:
+				if (iter->argumentsSize == 2)
 				{
-					int sz = iter->argumentsSize;
-				}break;
+					nProperty = FormatUtils::BytesToUInt16(iter->Arguments, 0, iter->argumentsSize);
+				}
+				else if (iter->argumentsSize == 1)
+				{
+					nProperty = FormatUtils::BytesToUChar(iter->Arguments, 0, iter->argumentsSize);
+				}
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/SettingsMapping.cpp

@@ -76,7 +76,6 @@ namespace DocFileFormat
 		_ctx->_docx->RegisterSettings();
 
 		//start w:settings
-		m_oXmlWriter.WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?"  );
 		m_oXmlWriter.WriteNodeBegin( L"w:settings",  TRUE );
 		//write namespaces
 		m_oXmlWriter.WriteAttribute( L"xmlns:w",  OpenXmlNamespaces::WordprocessingML );

ASCOfficeDocFile/DocDocxConverter/Spa.h

@@ -60,7 +60,6 @@ namespace DocFileFormat
 		}
 
 		Spa();
-
 		virtual ~Spa();
 
         virtual ByteStructure* ConstructObject(VirtualStreamReader* reader, int length);
@@ -68,7 +67,6 @@ namespace DocFileFormat
 		{
 			return spid;
 		}
-
 	private:
 
 		/// Shape Identifier. Used in conjunction with the office art data 

ASCOfficeDocFile/DocDocxConverter/SprmTDefTable.h

@@ -94,7 +94,7 @@ namespace DocFileFormat
 			numberOfColumns = bytes[0];
 			int pointer = 1;
 
-			// rgdxaCenter
+		// rgdxaCenter
 			for (int i = 0; i < numberOfColumns + 1; ++i)
 			{
 				int pos = FormatUtils::BytesToInt16(bytes, pointer, size);
@@ -103,7 +103,7 @@ namespace DocFileFormat
 			}
 
 
-			// rgTc80
+		// rgTc80
 
 			for (int i = 0; i < numberOfColumns; ++i)
 			{
@@ -114,23 +114,23 @@ namespace DocFileFormat
 						TC80 oTC80;
 						
 						oTC80.ftsWidth		=	Global::dxa;
-						oTC80.wWidth		=	3190;
+						oTC80.wWidth		=	0;
+
+						oTC80.brcTop = new BorderCode();
+						oTC80.brcLeft = new BorderCode();
+						oTC80.brcBottom = new BorderCode();
+						oTC80.brcRight = new BorderCode();
 
-						oTC80.brcTop		=	new BorderCode();
-						oTC80.brcLeft		=	new BorderCode();
-						oTC80.brcBottom		=	new BorderCode();
-						oTC80.brcRight		=	new BorderCode();
-						
 						rgTc80.push_back(oTC80);
 					}
 
 					break;
-				}	
+				}
 
 				TC80 tc;
-				// the flags
+	// the flags				
 				
-				unsigned short flags	=	FormatUtils::BytesToUInt16(bytes, pointer, size);
+				unsigned short flags = FormatUtils::BytesToUInt16(bytes, pointer, size);
 				
 				tc.horzMerge			=	(unsigned char)FormatUtils::BitmaskToInt((int)flags, 0x3);
 				tc.textFlow				=	(Global::TextFlow)FormatUtils::BitmaskToInt((int)flags, 0x1C);
@@ -139,38 +139,26 @@ namespace DocFileFormat
 				tc.ftsWidth				=	(Global::CellWidthType)FormatUtils::BitmaskToInt((int)flags, 0xE00);
 				tc.fFitText				=	FormatUtils::BitmaskToBool(flags, 0x1000);
 				tc.fNoWrap				=	FormatUtils::BitmaskToBool(flags, 0x2000);
-				tc.fHideMark			=	FormatUtils::BitmaskToBool(flags, 0x4000);
-				
+				tc.fHideMark			=	FormatUtils::BitmaskToBool(flags, 0x4000);				
+
 				pointer					+=	2;
 
-				// cell width
-				tc.wWidth				=	FormatUtils::BytesToInt16(bytes, pointer, size);
-				pointer					+=	2;
+	// cell width
+				tc.wWidth =	FormatUtils::BytesToInt16(bytes, pointer, size);
+				pointer +=	2;
 
 				const int borderCodeBytes = 4;
 
-				//border top
-				unsigned char brcTopBytes[borderCodeBytes];
-				memcpy(brcTopBytes, (bytes + pointer), borderCodeBytes);
-				tc.brcTop = new BorderCode(brcTopBytes, borderCodeBytes);
+				tc.brcTop = new BorderCode((bytes + pointer), borderCodeBytes);
 				pointer += borderCodeBytes;
 
-				//border left
-				unsigned char brcLeftBytes[borderCodeBytes];
-				memcpy(brcLeftBytes, (bytes + pointer), borderCodeBytes);
-				tc.brcLeft = new BorderCode(brcLeftBytes, borderCodeBytes);
+				tc.brcLeft = new BorderCode((bytes + pointer), borderCodeBytes);
 				pointer += borderCodeBytes;
 
-				//border bottom
-				unsigned char brcBottomBytes[borderCodeBytes];
-				memcpy(brcBottomBytes, (bytes + pointer), borderCodeBytes);
-				tc.brcBottom = new BorderCode(brcBottomBytes, borderCodeBytes);
+				tc.brcBottom = new BorderCode((bytes + pointer), borderCodeBytes);
 				pointer += borderCodeBytes;
 
-				//border top
-				unsigned char brcRightBytes[borderCodeBytes];
-				memcpy(brcRightBytes, (bytes + pointer), borderCodeBytes);
-				tc.brcRight = new BorderCode(brcRightBytes, borderCodeBytes);
+				tc.brcRight = new BorderCode((bytes + pointer), borderCodeBytes);
 				pointer += borderCodeBytes;
 
 				rgTc80.push_back(tc);

ASCOfficeDocFile/DocDocxConverter/StructuredStorageReader.h

@@ -140,7 +140,7 @@ namespace DocFileFormat
 			POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, size_stream);
 			if (!streamNew) return;
 
-			unsigned char* data_stream = new unsigned char[size_stream];
+			unsigned char* data_stream = new unsigned char[(unsigned int)size_stream];
 			if (data_stream)
 			{
 				stream->read(data_stream, size_stream);

ASCOfficeDocFile/DocDocxConverter/StyleSheetMapping.cpp

@@ -60,7 +60,6 @@ namespace DocFileFormat
 		this->_ctx->_docx->RegisterStyleSheet();
 
 		//start the document
-        m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
         m_pXmlWriter->WriteNodeBegin( L"w:styles", TRUE );
 
 		//write namespaces
@@ -98,12 +97,23 @@ namespace DocFileFormat
                 m_pXmlWriter->WriteAttribute( L"w:styleId", FormatUtils::XmlEncode(MakeStyleId( *iter )));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
-				// <w:name val="" />
+	// <w:name val="" />
+				std::wstring sName = FormatUtils::XmlEncode(getStyleName(*iter), true);
                 m_pXmlWriter->WriteNodeBegin( L"w:name", TRUE );
-                m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(getStyleName( *iter ), true ));
-                m_pXmlWriter->WriteNodeEnd( L"", TRUE );
+				if ((*iter)->sti == StyleIdentifier::Normal)
+					m_pXmlWriter->WriteAttribute(L"w:val", L"Normal");
+				else
+					m_pXmlWriter->WriteAttribute(L"w:val", sName);
+				m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
-				// <w:basedOn val="" />
+				if ((*iter)->sti == StyleIdentifier::Normal) // ??? < sti < 159
+				{
+					m_pXmlWriter->WriteNodeBegin(L"w:aliases", TRUE);
+					m_pXmlWriter->WriteAttribute(L"w:val", sName);
+					m_pXmlWriter->WriteNodeEnd(L"", TRUE);
+				}
+
+	// <w:basedOn val="" />
 				if ( ( (*iter)->istdBase != 4095 ) && ( (*iter)->istdBase < sheet->Styles->size() ) )
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:basedOn", TRUE );
@@ -111,7 +121,7 @@ namespace DocFileFormat
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 				}
 
-				// <w:next val="" />
+	// <w:next val="" />
 				if ( (*iter)->istdNext < sheet->Styles->size() )
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:next", TRUE );
@@ -119,7 +129,7 @@ namespace DocFileFormat
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 				}
 
-				// <w:link val="" />
+	// <w:link val="" />
 				if ( (*iter)->istdLink < sheet->Styles->size() )
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:link", TRUE );

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp

@@ -63,10 +63,6 @@ namespace DocFileFormat
 		RELEASEOBJECT(_tcPr);
 		RELEASEOBJECT(_tcMar);
 		RELEASEOBJECT(_tcBorders);
-		RELEASEOBJECT(_brcTop);
-		RELEASEOBJECT(_brcLeft);
-		RELEASEOBJECT(_brcRight);
-		RELEASEOBJECT(_brcBottom);
 	}
 }
 
@@ -97,7 +93,6 @@ namespace DocFileFormat
 			}
 		}
 
-
 		bool bPresentDefTable = false;
 		for (std::list<SinglePropertyModifier>::reverse_iterator iter = tapx->grpprl->rbegin(); iter != tapx->grpprl->rend(); ++iter)
 		{
@@ -111,6 +106,18 @@ namespace DocFileFormat
 						bPresentDefTable = true;
 
 						SprmTDefTable tdef(iter->Arguments, iter->argumentsSize);
+
+						bool bUseWidth = true;
+
+						for (size_t j = 0; j < tdef.rgTc80.size(); ++j)
+						{ // 1bc0f6c0-b226-4bcb-912c-e7f97b009d8a.doc
+						  // Технические_Требования_1_287_ДИТ.DOC
+							if (tdef.rgTc80[j].horzMerge == 0 && tdef.rgTc80[j].wWidth < 1)
+							{
+								bUseWidth = false; 
+								break;
+							}
+						}
 						int cc = tdef.numberOfColumns;
 
 						_tGrid = tdef.rgdxaCenter;
@@ -172,33 +179,23 @@ namespace DocFileFormat
 							_gridSpan = 1;
 
 							nComputedCellWidths +=  (tdef.rgdxaCenter[ _cellIndex + 1] - tdef.rgdxaCenter[ 0 ]);
-							nComputedCellWidth	+= tdef.rgTc80[ _cellIndex].wWidth > 1 ? tdef.rgTc80[ _cellIndex].wWidth : (tdef.rgdxaCenter[ _cellIndex + 1] - tdef.rgdxaCenter[ _cellIndex ]);
-							//Технические_Требования_1_287_ДИТ.DOC
-
+							nComputedCellWidth	+= bUseWidth ? tdef.rgTc80[ _cellIndex].wWidth :
+													(tdef.rgdxaCenter[ _cellIndex + 1] - tdef.rgdxaCenter[ _cellIndex ]);
 						}
 
 						if (!IsTableBordersDefined(tapx->grpprl))
 						{
-							RELEASEOBJECT(_brcTop);
-							_brcTop = new BorderCode(*_tcDef.brcTop);
-
-							RELEASEOBJECT(_brcLeft);
-							_brcLeft = new BorderCode(*_tcDef.brcLeft);
-
-							RELEASEOBJECT(_brcRight);
-							_brcRight = new BorderCode(*_tcDef.brcRight);
-
-							RELEASEOBJECT(_brcBottom);
-							_brcBottom = new BorderCode(*_tcDef.brcBottom);
+							_brcTop = std::shared_ptr<BorderCode>(new BorderCode(*_tcDef.brcTop));
+							_brcLeft = std::shared_ptr<BorderCode>(new BorderCode(*_tcDef.brcLeft));
+							_brcRight = std::shared_ptr<BorderCode>(new BorderCode(*_tcDef.brcRight));
+							_brcBottom = std::shared_ptr<BorderCode>(new BorderCode(*_tcDef.brcBottom));
 						}
 					}
 				}
 				break;
-
 				case sprmTDxaCol:
 				{
 				}break;
-
 				case sprmTCellPadding:
 				{
 					unsigned char first		=	iter->Arguments[0];
@@ -237,10 +234,9 @@ namespace DocFileFormat
 						apppendCellShading(iter->Arguments, iter->argumentsSize, _cellIndex);
 					}
 				}break;
-
 				case sprmOldTDefTableShd:
 				case sprmTDefTableShd:
-				{						//	cell shading for cells 0-20
+				{ //	cell shading for cells 0-20
 					apppendCellShading(iter->Arguments, iter->argumentsSize, _cellIndex);
 				}break;
 
@@ -248,14 +244,12 @@ namespace DocFileFormat
 				{						//	cell shading for cells 21-42
 					apppendCellShading(iter->Arguments, iter->argumentsSize, (_cellIndex - 21));
 				}break;
-
 				case sprmTDefTableShd3rd:
 				{						//	cell shading for cells 43-62
 					apppendCellShading(iter->Arguments, iter->argumentsSize, (_cellIndex - 43));
 				}break;
-
 				case sprmTCellWidth:
-				{				//width
+				{ //width
 					unsigned char first		=	iter->Arguments[0];
 					unsigned char lim		=	iter->Arguments[1];
 
@@ -265,10 +259,9 @@ namespace DocFileFormat
 						_width		=	FormatUtils::BytesToInt16(iter->Arguments, 3, iter->argumentsSize);
 					}
 				}
-				break;
-				
+				break;				
 				case sprmTVertAlign:
-				{							//vertical alignment
+				{ //vertical alignment
 					unsigned char first		=	iter->Arguments[0];
 					unsigned char lim		=	iter->Arguments[1];
 
@@ -278,7 +271,6 @@ namespace DocFileFormat
 					}
 				}
 				break;
-
 				case sprmTFitText:
 				{				//Autofit
 					unsigned char first = iter->Arguments[0];
@@ -290,10 +282,9 @@ namespace DocFileFormat
 					}
 				}
 				break;
-
 				case sprmOldTSetBrc:
 				case sprmTSetBrc:
-				{					//borders (cell definition)
+				{ //borders (cell definition)
 					unsigned char min = iter->Arguments[0];
 					unsigned char max = iter->Arguments[1];
 
@@ -307,35 +298,34 @@ namespace DocFileFormat
 
 						if( FormatUtils::BitmaskToBool( bordersToApply, 0x01 ) )
 						{
-							RELEASEOBJECT( _brcTop );
-							_brcTop = new BorderCode( brcBytes, brcSize );
+							_brcTop = std::shared_ptr<BorderCode>(new BorderCode( brcBytes, brcSize ));
 						}
-
 						if( FormatUtils::BitmaskToBool( bordersToApply, 0x02 ) )
 						{
-							RELEASEOBJECT( _brcLeft );
-							_brcLeft = new BorderCode( brcBytes, brcSize );
+							_brcLeft = std::shared_ptr<BorderCode>(new BorderCode( brcBytes, brcSize ));
 						}
-
 						if ( FormatUtils::BitmaskToBool( bordersToApply, 0x04 ) )
 						{
-							RELEASEOBJECT( _brcBottom );
-							_brcBottom = new BorderCode( brcBytes, brcSize );
+							_brcBottom = std::shared_ptr<BorderCode>(new BorderCode( brcBytes, brcSize ));
 						}
-
 						if ( FormatUtils::BitmaskToBool( bordersToApply, 0x08 ) )
 						{
-							RELEASEOBJECT( _brcRight );
-							_brcRight = new BorderCode( brcBytes, brcSize );
+							_brcRight = std::shared_ptr<BorderCode>(new BorderCode( brcBytes, brcSize ));
 						}
 					}
-				}
-				break;
+				}break;
+				
 				default:
 					break;
 			}
 		}
-		if (_gridSpan <= 1 && nComputedCellWidth > _width && _width > 1)
+		int nComputedCellWidthsGrid = 0;
+
+		for (size_t ccc = 0; ccc < _grid->size() && ccc <= _gridIndex; ccc++)
+		{
+			nComputedCellWidthsGrid += _grid->at(ccc);
+		}//zadost.doc
+		if (_gridSpan <= 1 && nComputedCellWidth > _width/* && _width > 1*/ && nComputedCellWidths > nComputedCellWidthsGrid)
 		{
 			int width_current = 0;
 			for (int i = _gridIndex; i < _grid->size();  i++)
@@ -348,22 +338,22 @@ namespace DocFileFormat
 			_width = nComputedCellWidth;
 		}
 
-		XMLTools::XMLElement    tcW     ( L"w:tcW" );
-		
-
+		XMLTools::XMLElement tcW ( L"w:tcW" );
+	
+		if (_width > 1 || nComputedCellWidth > 0)
+		{
+			if (_ftsWidth == Global::CellWidthType::nil)
+				_ftsWidth = Global::CellWidthType::dxa;
+		}
+		else _ftsWidth = Global::CellWidthType::Auto;
+	
 		XMLTools::XMLAttribute  tcWVal  ( L"w:w", FormatUtils::IntToWideString( _width > 1 ? _width : nComputedCellWidth) );
-		XMLTools::XMLAttribute  tcWType ( L"w:type",  (_width > 1 || nComputedCellWidth > 0) ? FormatUtils::MapValueToWideString( _ftsWidth, &Global::CellWidthTypeMap[0][0], 4, 5 ) : L"auto");
+		XMLTools::XMLAttribute  tcWType ( L"w:type", FormatUtils::MapValueToWideString(_ftsWidth, &Global::CellWidthTypeMap[0][0], 4, 5 ));
 
-		tcW.AppendAttribute( tcWType );
 		tcW.AppendAttribute( tcWVal );
+		tcW.AppendAttribute( tcWType );
 		_tcPr->AppendChild( tcW );
 
-		int nComputedCellWidthsGrid = 0;
-
-		for (size_t ccc = 0; ccc < _grid->size() && ccc <= _gridIndex; ccc++)
-		{
-			nComputedCellWidthsGrid += _grid->at(ccc);
-		}
 		if ( _gridSpan == 1 && ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidths > nComputedCellWidthsGrid ) )
 		{
 			//check the number of merged cells
@@ -394,28 +384,28 @@ namespace DocFileFormat
 		if (_brcTop)
 		{
             XMLTools::XMLElement topBorder( L"w:top" );
-			appendBorderAttributes(_brcTop, &topBorder);
+			appendBorderAttributes(_brcTop.get(), &topBorder);
 			addOrSetBorder(_tcBorders, &topBorder );
 		}
 
 		if (_brcLeft )
 		{
             XMLTools::XMLElement leftBorder( L"w:left" );
-			appendBorderAttributes(_brcLeft, &leftBorder);
+			appendBorderAttributes(_brcLeft.get(), &leftBorder);
 			addOrSetBorder(_tcBorders, &leftBorder);
 		}
 
 		if (_brcBottom)
 		{
             XMLTools::XMLElement bottomBorder( L"w:bottom" );
-			appendBorderAttributes(_brcBottom, &bottomBorder);
+			appendBorderAttributes(_brcBottom.get(), &bottomBorder);
 			addOrSetBorder(_tcBorders, &bottomBorder);
 		}
 
 		if (_brcRight)
 		{
             XMLTools::XMLElement rightBorder( L"w:right" );
-			appendBorderAttributes( _brcRight, &rightBorder );
+			appendBorderAttributes( _brcRight.get(), &rightBorder );
 			addOrSetBorder( _tcBorders, &rightBorder );
 		}
 

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.h

@@ -87,15 +87,15 @@ namespace DocFileFormat
 		const std::vector<short>*	_grid;
 		std::vector<short>			_tGrid;
 
-		short					_width;
+		int						_width;
 		Global::CellWidthType	_ftsWidth;
 		TC80					_tcDef;
 		unsigned int			_depth;
 
-		BorderCode* _brcTop;
-		BorderCode* _brcLeft;
-		BorderCode* _brcRight;
-		BorderCode* _brcBottom;
+		std::shared_ptr<BorderCode> _brcLeft;
+		std::shared_ptr<BorderCode> _brcTop;
+		std::shared_ptr<BorderCode> _brcBottom;
+		std::shared_ptr<BorderCode> _brcRight;
 
 		int		_gridSpan;
 		bool	_bCoverCell;

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp

@@ -47,491 +47,390 @@ TablePropertiesMapping::~TablePropertiesMapping()
 	RELEASEOBJECT (_tblPr);
 	RELEASEOBJECT (_tblGrid);
 	RELEASEOBJECT (_tblBorders);
-	RELEASEOBJECT (brcLeft);
-	RELEASEOBJECT (brcTop);
-	RELEASEOBJECT (brcBottom);
-	RELEASEOBJECT (brcRight);
-	RELEASEOBJECT (brcHorz);
-	RELEASEOBJECT (brcVert);
 }
-}
-namespace DocFileFormat
+
+void TablePropertiesMapping::Apply(IVisitable* visited)
 {
-	void TablePropertiesMapping::Apply(IVisitable* visited)
+	TablePropertyExceptions* tapx = static_cast<TablePropertyExceptions*>(visited);
+
+	XMLTools::XMLElement	tblCellMar(L"w:tblCellMar");
+	XMLTools::XMLElement	tblLayout(L"w:tblLayout");
+	XMLTools::XMLElement	tblpPr(L"w:tblpPr");
+	XMLTools::XMLAttribute	layoutType(L"w:type", L"fixed");
+
+	_CP_OPT(short) tblIndent;
+	short gabHalf = 0;
+	short marginLeft = 0;
+	short marginRight = 0;
+
+	short cellSpacing = 0;
+
+	BYTE itcFirst = 0;
+	BYTE itcLim = 0;
+
+	bool bTableW = false;
+
+	for (std::list<SinglePropertyModifier>::iterator iter = tapx->grpprl->begin(); iter != tapx->grpprl->end(); iter++)
 	{
-		TablePropertyExceptions* tapx = static_cast<TablePropertyExceptions*>( visited );
-
-        XMLTools::XMLElement	tblCellMar	( L"w:tblCellMar");
-        XMLTools::XMLElement	tblLayout	( L"w:tblLayout");
-        XMLTools::XMLElement	tblpPr		( L"w:tblpPr");
-        XMLTools::XMLAttribute	layoutType	( L"w:type", L"");
-		
-		bool bLayoutFixed = true;
-		//layoutType.SetValue(L"fixed");  
-
-		_CP_OPT(short) tblIndent;
-		short gabHalf		= 0;
-		short marginLeft	= 0;
-		short marginRight	= 0;
-
-		BYTE itcFirst		= 0;
-		BYTE itcLim			= 0;
-
-		bool bTableW = false;
-
-		for ( std::list<SinglePropertyModifier>::iterator iter = tapx->grpprl->begin(); iter != tapx->grpprl->end(); iter++ )
+		switch (iter->OpCode)
 		{
-			switch( iter->OpCode )
+		case sprmOldTDxaGapHalf:
+		case sprmTDxaGapHalf:
+		{
+			gabHalf = FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize);
+		}break;
+		case sprmOldTDefTable:
+		case sprmTDefTable:
+		{
+			//table definition
+			SprmTDefTable tDef(iter->Arguments, iter->argumentsSize);
+			//Workaround for retrieving the indent of the table:
+			//In some files there is a indent but no sprmTWidthIndent is set.
+			//For this cases we can calculate the indent of the table by getting the 
+			//first boundary of the TDef and adding the padding of the cells
+
+			tblIndent = gabHalf + FormatUtils::BytesToInt16(iter->Arguments, 1, iter->argumentsSize);
+			//If there follows a real sprmTWidthIndent, this value will be overwritten
+
+			//tblIndent = (std::max)((int)tblIndent,0); //cerere.doc
+		}break;
+		case sprmTTableWidth:
+		{
+			//preferred table width
+			unsigned char fts = iter->Arguments[0];
+			short width = FormatUtils::BytesToInt16(iter->Arguments, 1, iter->argumentsSize);
+
+			XMLTools::XMLElement tblW(L"w:tblW");
+
+			XMLTools::XMLAttribute w(L"w:w", FormatUtils::IntToWideString(width));
+			XMLTools::XMLAttribute type(L"w:type", FormatUtils::MapValueToWideString(fts, &WidthType[0][0], 4, 5));
+
+			tblW.AppendAttribute(type);
+			tblW.AppendAttribute(w);
+
+			_tblPr->AppendChild(tblW);
+
+			bTableW = true;
+		}break;
+		case sprmTMerge:
+		{
+			itcFirst = iter->Arguments[0];
+			itcLim = iter->Arguments[1];
+		}break;
+		case sprmTSplit:
+		{
+
+		}break;
+		case sprmOldTJc:
+		case sprmTJc:
+		case sprmTJcRow:
+		{
+			appendValueElement(_tblPr, L"jc", FormatUtils::MapValueToWideString(iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15), true);
+		}break;
+		case sprmTWidthIndent:
+		{
+			tblIndent = FtsWWidth_Indent(iter->Arguments).wWidth;
+		}break;
+		case sprmTIstd:
+		case sprmTIstdPermute:
+		{
+			if (_isTableStyleNeeded)
 			{
-				case sprmOldTDxaGapHalf:
-				case sprmTDxaGapHalf:
+				size_t ind = FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize);
+
+				std::wstring id = ind < _styles->Styles->size() ? StyleSheetMapping::MakeStyleId(_styles->Styles->at(ind)) : L"";
+
+				if (id != std::wstring(L"TableNormal") && !id.empty())
 				{
-					gabHalf = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
-				}
-				break;
-
-				case sprmOldTDefTable:
-				case sprmTDefTable:
-				{				
-	//table definition
-					SprmTDefTable tDef( iter->Arguments, iter->argumentsSize );
-					//Workaround for retrieving the indent of the table:
-					//In some files there is a indent but no sprmTWidthIndent is set.
-					//For this cases we can calculate the indent of the table by getting the 
-					//first boundary of the TDef and adding the padding of the cells
-					
-					tblIndent = gabHalf + FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize );
-					//If there follows a real sprmTWidthIndent, this value will be overwritten
-
-                    //tblIndent = (std::max)((int)tblIndent,0); //cerere.doc
-				}
-				break;
-
-				case sprmTTableWidth:
-				{	
-	//preferred table width
-					unsigned char fts = iter->Arguments[0];
-					short width = FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize );
-
-                    XMLTools::XMLElement tblW( L"w:tblW");
-
-                    XMLTools::XMLAttribute w( L"w:w", FormatUtils::IntToWideString( width ) );
-                    XMLTools::XMLAttribute type( L"w:type", FormatUtils::MapValueToWideString( fts, &WidthType[0][0], 4, 5 ) );
-
-					tblW.AppendAttribute( type );
-					tblW.AppendAttribute( w );
-
-					_tblPr->AppendChild( tblW );
-
-					bTableW = true;
-				}
-				break;
-				case sprmTMerge:
-				{
-					itcFirst = iter->Arguments[0];
-					itcLim = iter->Arguments[1];
-				}break;
-				case sprmTSplit:
-				{
-
-				}break;
-				case sprmOldTJc:
-				case sprmTJc:
-				case sprmTJcRow:
-				{				//justification
-
-                    appendValueElement( _tblPr, L"jc" , FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ), true );
-				}
-				break;
-
-				case sprmTWidthIndent:
-				{				//indent
-
-					tblIndent	=	FtsWWidth_Indent(iter->Arguments).wWidth;
-					// tblIndent	=	FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize );
-				}
-				break;
-
-				case sprmTIstd:
-				case sprmTIstdPermute:
-				{				//style
-
-					if ( _isTableStyleNeeded )
-					{
-						size_t ind = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
-						
-						std::wstring id = ind < _styles->Styles->size() ? StyleSheetMapping::MakeStyleId( _styles->Styles->at( ind ) ) : L"";
-
-                        if( id != std::wstring( L"TableNormal") && !id.empty() )
-						{
-                            appendValueElement( _tblPr, L"tblStyle", id, true );
-						}
-					}
-				}
-				break;
-
-				case sprmTFBiDi:
-				case sprmTFBiDi90:
-				{				//bidi
-
-                    appendValueElement( _tblPr, L"bidiVisual", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), true );
-				}
-				break;
-
-				case sprmOldTTlp:
-				case sprmTTlp:
-				{				//table look
-
-                    appendValueElement( _tblPr, L"tblLook", FormatUtils::IntToFormattedWideString( FormatUtils::BytesToInt16( iter->Arguments, 2, iter->argumentsSize ), L"%04x" ), true );
-				}
-				break;
-				case sprmTFAutofit:
-				{//autofit
-
-					layoutType.SetValue(L"fixed");
-					if ( iter->Arguments[0] == 1 )
-					{
-                        layoutType.SetValue( L"auto" );
-						bLayoutFixed = false;
-					}
-				}break;	
-				case sprmTCellPadding:
-				case sprmTCellPaddingDefault:
-				case sprmTCellPaddingOuter:
-				{				//default cell padding (margin)
-
-					unsigned char grfbrc = iter->Arguments[2];
-					short wMar = FormatUtils::BytesToInt16( iter->Arguments, 4, iter->argumentsSize );
-					std::wstring strValue = FormatUtils::IntToWideString( wMar );
-
-					if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x01 ) )
-					{
-                        appendDxaElement( &tblCellMar,  L"top" , strValue, true );
-					}
-
-					if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x02 ) )
-					{
-						marginLeft = wMar;
-					}
-
-					if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x04 ) )
-					{
-                        appendDxaElement( &tblCellMar, L"bottom", strValue, true );
-					}
-
-					if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x08 ) )
-					{
-						marginRight = wMar;
-					}
-				}
-				break;
-
-				case sprmTCHorzBands:
-				{				//row count
-
-                    appendValueElement( _tblPr, L"tblStyleRowBandSize", iter->Arguments[0], true );
-				}
-				break;
-
-				case sprmTCVertBands:
-				{				//col count
-
-                    appendValueElement( _tblPr, L"tblStyleColBandSize", iter->Arguments[0], true );
-				}
-				break;
-
-				case sprmTFNoAllowOverlap:
-				{				//overlap
-
-                    std::wstring tblOverlapVal = std::wstring( L"overlap");
-
-					if ( iter->Arguments[0] )
-					{
-                        tblOverlapVal = std::wstring( L"never");
-					}
-
-                    appendValueElement( _tblPr, L"tblOverlap", tblOverlapVal, true );
-				}
-				break;
-
-				case sprmOldTSetShd	:
-				case sprmTSetShdTable :
-				{				//shading
-
-					appendShading( _tblPr, ShadingDescriptor( iter->Arguments, iter->argumentsSize ) );
-				}
-				break;
-
-				case sprmTTableBorders80:
-				{				//borders 80 exceptions
-
-					const int size = 4;
-					unsigned char brc80[size];
-
-					//top border
-					memcpy( brc80, iter->Arguments, size );
-					RELEASEOBJECT( brcTop );
-					brcTop = new BorderCode( brc80, size );
-
-					//left
-					memcpy( brc80, ( iter->Arguments + 4 ), size );
-					RELEASEOBJECT( brcLeft );
-					brcLeft = new BorderCode( brc80, size );
-
-					//bottom
-					memcpy( brc80, ( iter->Arguments + 8 ), size );
-					RELEASEOBJECT( brcBottom );
-					brcBottom = new BorderCode( brc80, size );
-
-					//right
-					memcpy( brc80, ( iter->Arguments + 12 ), size );
-					RELEASEOBJECT( brcRight );
-					brcRight = new BorderCode( brc80, size );
-
-					//inside H
-					memcpy( brc80, ( iter->Arguments + 16 ), size );
-					RELEASEOBJECT( brcHorz );
-					brcHorz = new BorderCode( brc80, size );
-
-					//inside V
-					memcpy( brc80, ( iter->Arguments + 20 ), size );
-					RELEASEOBJECT( brcVert );
-					brcVert = new BorderCode( brc80, size );
-				}
-				break;
-
-				//border exceptions
-				case sprmOldTTableBorders:
-				case sprmTTableBorders:
-				{
-					const int size = 8;
-					unsigned char brc[size];
-
-					//top border
-					memcpy( brc, iter->Arguments, size );
-					RELEASEOBJECT( brcTop );
-					brcTop = new BorderCode( brc, size );
-
-					//left
-					memcpy( brc, ( iter->Arguments + 8 ), size );
-					RELEASEOBJECT( brcLeft );
-					brcLeft = new BorderCode( brc, size );
-
-					//bottom
-					memcpy( brc, ( iter->Arguments + 16 ), size );
-					RELEASEOBJECT( brcBottom );
-					brcBottom = new BorderCode( brc, size );
-
-					//right
-					memcpy( brc, ( iter->Arguments + 24 ), size );
-					RELEASEOBJECT( brcRight );
-					brcRight = new BorderCode( brc, size );
-
-					//inside H
-					memcpy( brc, ( iter->Arguments + 32 ), size );
-					RELEASEOBJECT( brcHorz );
-					brcHorz = new BorderCode( brc, size );
-
-					//inside V
-					memcpy( brc, ( iter->Arguments + 40 ), size );
-					RELEASEOBJECT( brcVert );
-					brcVert = new BorderCode( brc, size );
-				}
-				break;
-
-				//floating table properties
-				case sprmTPc:
-				{
-					unsigned char flag = ( iter->Arguments[0] & 0x30 ) >> 4;
-
-                    appendValueAttribute( &tblpPr, L"w:vertAnchor", FormatUtils::MapValueToWideString( flag, &Global::VerticalPositionCode[0][0], 4, 7 ) );
-
-					flag = ( iter->Arguments[0] & 0xC0 ) >> 6;
-
-                    appendValueAttribute( &tblpPr, L"w:horzAnchor", FormatUtils::MapValueToWideString( flag, &Global::HorizontalPositionCode[0][0], 4, 7 ) );
-				}
-				break;
-
-				case sprmTDxaFromText:
-				{
-                    appendValueAttribute( &tblpPr, L"w:leftFromText", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-				}
-				break;
-
-				case sprmTDxaFromTextRight:
-				{
-                    appendValueAttribute( &tblpPr, L"w:rightFromText", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-				}
-				break;
-
-				case sprmTDyaFromText:
-				{
-                    appendValueAttribute( &tblpPr, L"w:topFromText", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-				}
-				break;
-
-				case sprmTDyaFromTextBottom:
-				{
-                    appendValueAttribute( &tblpPr, L"w:bottomFromText", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-				}			
-				break;
-
-				case sprmTDxaAbs:
-				{
-                    appendValueAttribute( &tblpPr, L"w:tblpX", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-				}
-				break;
-
-				case sprmTDyaAbs:
-				{
-                    appendValueAttribute( &tblpPr, L"w:tblpY", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
-				}
-				break;
-			}
-		}
-		if (false == bTableW)
-		{
-            XMLTools::XMLElement tblW( L"w:tblW");
-
-            XMLTools::XMLAttribute w( L"w:w", L"0");
-			XMLTools::XMLAttribute type( L"w:type", L"auto" );
-
-			tblW.AppendAttribute( type );
-			tblW.AppendAttribute( w );
-
-			_tblPr->AppendChild( tblW );
-		}
-
-	//indent
-		if ( tblIndent )
-		{
-            XMLTools::XMLElement tblInd( L"w:tblInd");
-
-            XMLTools::XMLAttribute tblIndW( L"w:w", FormatUtils::IntToWideString( *tblIndent ) );
-			tblInd.AppendAttribute( tblIndW );
-
-            XMLTools::XMLAttribute tblIndType( L"w:type", L"dxa");
-			tblInd.AppendAttribute( tblIndType );
-
-			_tblPr->AppendChild( tblInd );
-		}
-
-	//append floating props
-		if ( tblpPr.GetAttributeCount() > 0 )
-		{
-			_tblPr->AppendChild( tblpPr );
-		}
-
-		//set borders
-		if ( brcTop != NULL )
-		{
-            XMLTools::XMLElement topBorder( L"w:top");
-			appendBorderAttributes( brcTop, &topBorder );
-			addOrSetBorder( _tblBorders, &topBorder );
-		}
-
-		if ( brcLeft != NULL )
-		{
-            XMLTools::XMLElement leftBorder( L"w:left");
-			appendBorderAttributes( brcLeft, &leftBorder );
-			addOrSetBorder( _tblBorders, &leftBorder );
-		}
-
-		if ( brcBottom != NULL )
-		{
-            XMLTools::XMLElement bottomBorder( L"w:bottom");
-			appendBorderAttributes( brcBottom, &bottomBorder );
-			addOrSetBorder( _tblBorders, &bottomBorder );
-		}
-
-		if ( brcRight != NULL )
-		{
-            XMLTools::XMLElement rightBorder( L"w:right");
-			appendBorderAttributes( brcRight, &rightBorder );
-			addOrSetBorder( _tblBorders, &rightBorder );
-		}
-
-		if ( brcHorz != NULL )
-		{
-            XMLTools::XMLElement insideHBorder( L"w:insideH");
-			appendBorderAttributes( brcHorz, &insideHBorder );
-			addOrSetBorder( _tblBorders, &insideHBorder );
-		}
-
-		if ( brcVert != NULL )
-		{
-            XMLTools::XMLElement insideVBorder( L"w:insideV");
-			appendBorderAttributes( brcVert, &insideVBorder );
-			addOrSetBorder( _tblBorders, &insideVBorder );
-		}
-
-		if ( _tblBorders->GetChildCount() > 0 )
-		{
-			_tblPr->AppendChild( *_tblBorders );
-		}
-
-		if (false == layoutType.GetValue().empty())
-		{
-			tblLayout.AppendAttribute(layoutType);
-		}
-		_tblPr->AppendChild( tblLayout );
-
-		if ( ( marginLeft == 0 ) && ( gabHalf != 0 ) )
-		{
-            appendDxaElement( &tblCellMar, L"left", FormatUtils::IntToWideString( gabHalf ), true );
-		}
-		else
-		{
-            appendDxaElement( &tblCellMar, L"left", FormatUtils::IntToWideString( marginLeft ), true );
-		}
-
-		if ( ( marginRight == 0 ) && ( gabHalf != 0 ) )
-		{
-            appendDxaElement( &tblCellMar, L"right", FormatUtils::IntToWideString( gabHalf ), true );
-		}
-		else
-		{
-            appendDxaElement( &tblCellMar, L"right", FormatUtils::IntToWideString( marginRight ), true );
-		}
-
-		_tblPr->AppendChild( tblCellMar );
-
-		//write Properties
-		if ( ( _tblPr->GetChildCount() > 0 ) || ( _tblPr->GetAttributeCount() > 0 ) )
-		{
-			m_pXmlWriter->WriteString( _tblPr->GetXMLString() );
-		}
-
-		//append the grid
-        _tblGrid = new XMLTools::XMLElement( L"w:tblGrid");
-
-		//Если _grid состоит из одних DocFormatUtils::gc_nZeroWidth и layout != "fixed", значит это doc полученный нами при конвертации из html. Таблицу размеров писать не нужно
-		
-		bool bWriteGridCol = false;
-		if (true == bLayoutFixed)
-			bWriteGridCol = true;
-		else
-		{
-			for ( size_t i = 0, nSize = _grid->size(); i < nSize; i++ )
-			{
-				if(_grid->at(i) % DocFileFormat::gc_nZeroWidth != 0)
-				{
-					bWriteGridCol = true;
-					break;
+					appendValueElement(_tblPr, L"tblStyle", id, true);
 				}
 			}
-		}
-		if (true == bWriteGridCol)
+		}break;
+		case sprmTFBiDi:
+		case sprmTFBiDi90:
 		{
-			for ( size_t i = 0; i < _grid->size(); i++ )		
+			appendValueElement(_tblPr, L"bidiVisual", FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize), true);
+		}break;
+		case sprmOldTTlp:
+		case sprmTTlp:
+		{
+			appendValueElement(_tblPr, L"tblLook", FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt16(iter->Arguments, 2, iter->argumentsSize), L"%04x"), true);
+		}break;
+		case sprmTFAutofit:
+		{
+			if (iter->Arguments[0] == 1)
 			{
-                XMLTools::XMLElement gridCol( L"w:gridCol");
-                XMLTools::XMLAttribute gridColW( L"w:w", FormatUtils::IntToWideString( _grid->at( i ) ) );
-				gridCol.AppendAttribute( gridColW );
-				_tblGrid->AppendChild( gridCol );
+				layoutType.SetValue(L"auto");
 			}
-		}
+		}break;
+		case sprmTCellSpacing:
+		case sprmTCellSpacingDefault:
+		{
+			unsigned char grfbrc = iter->Arguments[2];
+			short wSpc = FormatUtils::BytesToInt16(iter->Arguments, 4, iter->argumentsSize);
+			std::wstring strValue = FormatUtils::IntToWideString(wSpc);
+			if (FormatUtils::BitmaskToBool((int)grfbrc, 0x01))
+			{
+				appendDxaElement(_tblPr, L"tblCellSpacing", strValue, true);
+			}
+			if (FormatUtils::BitmaskToBool((int)grfbrc, 0x02))
+			{
+				cellSpacing = wSpc;
+			}
+		}break;
+		case sprmTCellPadding:
+		case sprmTCellPaddingDefault:
+		case sprmTCellPaddingOuter:
+		{//default cell padding (margin)
+			unsigned char grfbrc = iter->Arguments[2];
+			short wMar = FormatUtils::BytesToInt16(iter->Arguments, 4, iter->argumentsSize);
+			std::wstring strValue = FormatUtils::IntToWideString(wMar);
 
-		m_pXmlWriter->WriteString( _tblGrid->GetXMLString() );
+			if (FormatUtils::BitmaskToBool((int)grfbrc, 0x01))
+			{
+				appendDxaElement(&tblCellMar, L"top", strValue, true);
+			}
+			if (FormatUtils::BitmaskToBool((int)grfbrc, 0x02))
+			{
+				marginLeft = wMar;
+			}
+			if (FormatUtils::BitmaskToBool((int)grfbrc, 0x04))
+			{
+				appendDxaElement(&tblCellMar, L"bottom", strValue, true);
+			}
+			if (FormatUtils::BitmaskToBool((int)grfbrc, 0x08))
+			{
+				marginRight = wMar;
+			}
+		}break;
+		case sprmTCHorzBands:
+		{
+			appendValueElement(_tblPr, L"tblStyleRowBandSize", iter->Arguments[0], true);
+		}break;
+		case sprmTCVertBands:
+		{
+			appendValueElement(_tblPr, L"tblStyleColBandSize", iter->Arguments[0], true);
+		}break;
+		case sprmTFNoAllowOverlap:
+		{
+			std::wstring tblOverlapVal(L"overlap");
+
+			if (iter->Arguments[0])
+			{
+				tblOverlapVal = L"never";
+			}
+
+			appendValueElement(_tblPr, L"tblOverlap", tblOverlapVal, true);
+		}break;
+		case sprmOldTSetShd:
+		case sprmTSetShdTable:
+		{
+
+			appendShading(_tblPr, ShadingDescriptor(iter->Arguments, iter->argumentsSize));
+		}break;
+		case sprmTTableBorders80:
+		{
+			const int size = 4;
+			unsigned char brc80[size];
+
+			memcpy(brc80, iter->Arguments, size);
+			brcTop = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+
+			memcpy(brc80, (iter->Arguments + 4), size);
+			brcLeft = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+
+			memcpy(brc80, (iter->Arguments + 8), size);
+			brcBottom = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+
+			memcpy(brc80, (iter->Arguments + 12), size);
+			brcRight = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+
+			memcpy(brc80, (iter->Arguments + 16), size);
+			brcHorz = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+
+			memcpy(brc80, (iter->Arguments + 20), size);
+			brcVert = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+		}break;
+		case sprmOldTTableBorders:
+		case sprmTTableBorders:
+		{
+			const int size = 8;
+			unsigned char brc[size];
+
+			memcpy(brc, iter->Arguments, size);
+			brcTop = std::shared_ptr<BorderCode>(new BorderCode(brc, size));
+
+			memcpy(brc, (iter->Arguments + 8), size);
+			brcLeft = std::shared_ptr<BorderCode>(new BorderCode(brc, size));
+
+			memcpy(brc, (iter->Arguments + 16), size);
+			brcBottom = std::shared_ptr<BorderCode>(new BorderCode(brc, size));
+
+			memcpy(brc, (iter->Arguments + 24), size);
+			brcRight = std::shared_ptr<BorderCode>(new BorderCode(brc, size));
+
+			memcpy(brc, (iter->Arguments + 32), size);
+			brcHorz = std::shared_ptr<BorderCode>(new BorderCode(brc, size));
+
+			memcpy(brc, (iter->Arguments + 40), size);
+			brcVert = std::shared_ptr<BorderCode>(new BorderCode(brc, size));
+		}break;
+		case sprmTPc:
+		{
+			unsigned char flag = (iter->Arguments[0] & 0x30) >> 4;
+
+			appendValueAttribute(&tblpPr, L"w:vertAnchor", FormatUtils::MapValueToWideString(flag, &Global::VerticalPositionCode[0][0], 4, 7));
+
+			flag = (iter->Arguments[0] & 0xC0) >> 6;
+
+			appendValueAttribute(&tblpPr, L"w:horzAnchor", FormatUtils::MapValueToWideString(flag, &Global::HorizontalPositionCode[0][0], 4, 7));
+		}break;
+		case sprmTDxaFromText:
+		{
+			appendValueAttribute(&tblpPr, L"w:leftFromText", FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize));
+		}break;
+		case sprmTDxaFromTextRight:
+		{
+			appendValueAttribute(&tblpPr, L"w:rightFromText", FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize));
+		}break;
+		case sprmTDyaFromText:
+		{
+			appendValueAttribute(&tblpPr, L"w:topFromText", FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize));
+		}break;
+		case sprmTDyaFromTextBottom:
+		{
+			appendValueAttribute(&tblpPr, L"w:bottomFromText", FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize));
+		}break;
+		case sprmTDxaAbs:
+		{
+			appendValueAttribute(&tblpPr, L"w:tblpX", FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize));
+		}break;
+		case sprmTDyaAbs:
+		{
+			appendValueAttribute(&tblpPr, L"w:tblpY", FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize));
+		}break;
+		}
 	}
+	if (false == bTableW)
+	{
+		XMLTools::XMLElement tblW(L"w:tblW");
+
+		XMLTools::XMLAttribute w(L"w:w", L"0");
+		XMLTools::XMLAttribute type(L"w:type", L"auto");
+
+		tblW.AppendAttribute(type);
+		tblW.AppendAttribute(w);
+
+		_tblPr->AppendChild(tblW);
+	}
+
+	if (tblIndent)
+	{
+		XMLTools::XMLElement tblInd(L"w:tblInd");
+
+		XMLTools::XMLAttribute tblIndW(L"w:w", FormatUtils::IntToWideString(*tblIndent));
+		tblInd.AppendAttribute(tblIndW);
+
+		XMLTools::XMLAttribute tblIndType(L"w:type", L"dxa");
+		tblInd.AppendAttribute(tblIndType);
+
+		_tblPr->AppendChild(tblInd);
+	}
+
+	if (tblpPr.GetAttributeCount() > 0)
+	{
+		_tblPr->AppendChild(tblpPr);
+	}
+
+	if (brcTop)
+	{
+		XMLTools::XMLElement topBorder(L"w:top");
+		appendBorderAttributes(brcTop.get(), &topBorder);
+		addOrSetBorder(_tblBorders, &topBorder);
+	}
+
+	if (brcLeft)
+	{
+		XMLTools::XMLElement leftBorder(L"w:left");
+		appendBorderAttributes(brcLeft.get(), &leftBorder);
+		addOrSetBorder(_tblBorders, &leftBorder);
+	}
+
+	if (brcBottom)
+	{
+		XMLTools::XMLElement bottomBorder(L"w:bottom");
+		appendBorderAttributes(brcBottom.get(), &bottomBorder);
+		addOrSetBorder(_tblBorders, &bottomBorder);
+	}
+
+	if (brcRight)
+	{
+		XMLTools::XMLElement rightBorder(L"w:right");
+		appendBorderAttributes(brcRight.get(), &rightBorder);
+		addOrSetBorder(_tblBorders, &rightBorder);
+	}
+
+	if (brcHorz)
+	{
+		XMLTools::XMLElement insideHBorder(L"w:insideH");
+		appendBorderAttributes(brcHorz.get(), &insideHBorder);
+		addOrSetBorder(_tblBorders, &insideHBorder);
+	}
+
+	if (brcVert)
+	{
+		XMLTools::XMLElement insideVBorder(L"w:insideV");
+		appendBorderAttributes(brcVert.get(), &insideVBorder);
+		addOrSetBorder(_tblBorders, &insideVBorder);
+	}
+
+	if (_tblBorders->GetChildCount() > 0)
+	{
+		_tblPr->AppendChild(*_tblBorders);
+	}
+
+	if (false == layoutType.GetValue().empty())
+	{
+		tblLayout.AppendAttribute(layoutType);
+	}
+	_tblPr->AppendChild(tblLayout);
+
+	if ((marginLeft == 0) && (gabHalf != 0))
+	{
+		appendDxaElement(&tblCellMar, L"left", FormatUtils::IntToWideString(gabHalf), true);
+	}
+	else
+	{
+		appendDxaElement(&tblCellMar, L"left", FormatUtils::IntToWideString(marginLeft), true);
+	}
+
+	if ((marginRight == 0) && (gabHalf != 0))
+	{
+		appendDxaElement(&tblCellMar, L"right", FormatUtils::IntToWideString(gabHalf), true);
+	}
+	else
+	{
+		appendDxaElement(&tblCellMar, L"right", FormatUtils::IntToWideString(marginRight), true);
+	}
+
+	_tblPr->AppendChild(tblCellMar);
+
+	if ((_tblPr->GetChildCount() > 0) || (_tblPr->GetAttributeCount() > 0))
+	{
+		m_pXmlWriter->WriteString(_tblPr->GetXMLString());
+	}
+
+	//append the grid
+	_tblGrid = new XMLTools::XMLElement(L"w:tblGrid");
+
+	for (size_t i = 0; i < _grid->size(); i++)
+	{
+		XMLTools::XMLElement gridCol(L"w:gridCol");
+		XMLTools::XMLAttribute gridColW(L"w:w", FormatUtils::IntToWideString(_grid->at(i)));
+		gridCol.AppendAttribute(gridColW);
+		_tblGrid->AppendChild(gridCol);
+	}
+
+	m_pXmlWriter->WriteString(_tblGrid->GetXMLString());
+}
 }

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.h

@@ -84,12 +84,12 @@ namespace DocFileFormat
 		StyleSheet* _styles;
 		std::vector<short>* _grid;
 		
-		BorderCode* brcLeft;
-		BorderCode* brcTop;
-		BorderCode* brcBottom;
-		BorderCode* brcRight;
-		BorderCode* brcHorz;
-		BorderCode* brcVert;
+		std::shared_ptr<BorderCode> brcLeft;
+		std::shared_ptr<BorderCode> brcTop;
+		std::shared_ptr<BorderCode> brcBottom;
+		std::shared_ptr<BorderCode> brcRight;
+		std::shared_ptr<BorderCode> brcHorz;
+		std::shared_ptr<BorderCode> brcVert;
 
 		bool _isTableStyleNeeded;
 	};

ASCOfficeDocFile/DocDocxConverter/TableRowPropertiesMapping.cpp

@@ -53,6 +53,13 @@ namespace DocFileFormat
 	{
 		TablePropertyExceptions* tapx = static_cast<TablePropertyExceptions*>( visited );
 
+		std::shared_ptr<BorderCode> brcLeft;
+		std::shared_ptr<BorderCode> brcTop;
+		std::shared_ptr<BorderCode> brcBottom;
+		std::shared_ptr<BorderCode> brcRight;
+		std::shared_ptr<BorderCode> brcHorz;
+		std::shared_ptr<BorderCode> brcVert;
+
 		//delete infos
 		RevisionData rev( _rowEndChpx );
 
@@ -84,7 +91,7 @@ namespace DocFileFormat
 					}
 				}break;	
 				case sprmTWidthAfter:
-				{						//width after
+				{ //width after
                     XMLTools::XMLElement wAfter( L"w:wAfter" );
                     XMLTools::XMLAttribute wAfterValue( L"w:w", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize ) ) );
 					wAfter.AppendAttribute( wAfterValue );
@@ -94,7 +101,7 @@ namespace DocFileFormat
 					_trPr->AppendChild( wAfter, true );
 				}break;	
 				case sprmTWidthBefore:
-				{						//width before
+				{ //width before
 					short before = FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize );
 
 					if ( before != 0 )
@@ -110,7 +117,7 @@ namespace DocFileFormat
 				}break;	
 				case sprmOldTDyaRowHeight:
 				case sprmTDyaRowHeight:
-				{						//row height
+				{ //row height
                     XMLTools::XMLElement rowHeight( L"w:trHeight" );
                     XMLTools::XMLAttribute rowHeightVal( L"w:val" );
                     XMLTools::XMLAttribute rowHeightRule( L"w:hRule" );
@@ -142,113 +149,98 @@ namespace DocFileFormat
 				case sprmOldTFCantSplit:
 				case sprmTFCantSplit:
 				case sprmTFCantSplit90:
-				{						//can't split
+				{ //can't split
 					appendFlagElement( _trPr, *iter, L"cantSplit", true );
-				}break;
-
-					//div id
+				}break;	
 				case sprmTIpgp:// = PGPInfo.ipgpSelf (PGPInfo structure describes the border and margin properties)
+				{	//div id
+				}break;
+				case sprmTCellSpacing:
+				case sprmTCellSpacingDefault:
 				{
+					unsigned char grfbrc = iter->Arguments[2];
+					short wSpc = FormatUtils::BytesToInt16(iter->Arguments, 4, iter->argumentsSize);
+					std::wstring strValue = FormatUtils::IntToWideString(wSpc);
+					if (FormatUtils::BitmaskToBool((int)grfbrc, 0x01))
+					{
+						appendDxaElement(_trPr, L"tblCellSpacing", strValue, true);
+					}
+				}break;
+				case sprmTTableBorders80:
+				{
+					const int size = 4;
+					unsigned char brc80[size];
+
+					memcpy(brc80, iter->Arguments, size);
+					brcTop = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+
+					memcpy(brc80, (iter->Arguments + 4), size);
+					brcLeft = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+
+					memcpy(brc80, (iter->Arguments + 8), size);
+					brcBottom = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+
+					memcpy(brc80, (iter->Arguments + 12), size);
+					brcRight = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+
+					memcpy(brc80, (iter->Arguments + 16), size);
+					brcHorz = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
+
+					memcpy(brc80, (iter->Arguments + 20), size);
+					brcVert = std::shared_ptr<BorderCode>(new BorderCode(brc80, size));
 				}break;
 				default:
 					break;
-				//borders 80 exceptions
-				//case SinglePropertyModifier.OperationCode.sprmTTableBorders80:
-				//    unsigned char[] brc80 = new unsigned char[4];
-				//    //top border
-				//    Array.Copy(sprm.Arguments, 0, brc80, 0, 4);
-				//    brcTop = new BorderCode(brc80);
-				//    //left
-				//    Array.Copy(sprm.Arguments, 4, brc80, 0, 4);
-				//    brcLeft = new BorderCode(brc80);
-				//    //bottom
-				//    Array.Copy(sprm.Arguments, 8, brc80, 0, 4);
-				//    brcBottom = new BorderCode(brc80);
-				//    //right
-				//    Array.Copy(sprm.Arguments, 12, brc80, 0, 4);
-				//    brcRight = new BorderCode(brc80);
-				//    //inside H
-				//    Array.Copy(sprm.Arguments, 16, brc80, 0, 4);
-				//    brcHorz = new BorderCode(brc80);
-				//    //inside V
-				//    Array.Copy(sprm.Arguments, 20, brc80, 0, 4);
-				//    brcVert = new BorderCode(brc80);
-				//    break;
-
-				//border exceptions
-				//case SinglePropertyModifier.OperationCode.sprmTTableBorders:
-				//    unsigned char[] brc = new unsigned char[8];
-				//    //top border
-				//    Array.Copy(sprm.Arguments, 0, brc, 0, 8);
-				//    brcTop = new BorderCode(brc);
-				//    //left
-				//    Array.Copy(sprm.Arguments, 8, brc, 0, 8);
-				//    brcLeft = new BorderCode(brc);
-				//    //bottom
-				//    Array.Copy(sprm.Arguments, 16, brc, 0, 8);
-				//    brcBottom = new BorderCode(brc);
-				//    //right
-				//    Array.Copy(sprm.Arguments, 24, brc, 0, 8);
-				//    brcRight = new BorderCode(brc);
-				//    //inside H
-				//    Array.Copy(sprm.Arguments, 32, brc, 0, 8);
-				//    brcHorz = new BorderCode(brc);
-				//    //inside V
-				//    Array.Copy(sprm.Arguments, 40, brc, 0, 8);
-				//    brcVert = new BorderCode(brc);
-				//    break;
 			}
 		}
 
 		//set borders
-		//if (brcTop != null)
-		//{
-		//    XmlNode topBorder = _nodeFactory.CreateNode(XmlNodeType.Element, "w", "top", OpenXmlNamespaces.WordprocessingML);
-		//    appendBorderAttributes(brcTop, topBorder);
-		//    addOrSetBorder(_tblBorders, topBorder);
-		//}
-		//if (brcLeft != null)
-		//{
-		//    XmlNode leftBorder = _nodeFactory.CreateNode(XmlNodeType.Element, "w", "left", OpenXmlNamespaces.WordprocessingML);
-		//    appendBorderAttributes(brcLeft, leftBorder);
-		//    addOrSetBorder(_tblBorders, leftBorder);
-		//}
-		//if (brcBottom != null)
-		//{
-		//    XmlNode bottomBorder = _nodeFactory.CreateNode(XmlNodeType.Element, "w", "bottom", OpenXmlNamespaces.WordprocessingML);
-		//    appendBorderAttributes(brcBottom, bottomBorder);
-		//    addOrSetBorder(_tblBorders, bottomBorder);
-		//}
-		//if (brcRight != null)
-		//{
-		//    XmlNode rightBorder = _nodeFactory.CreateNode(XmlNodeType.Element, "w", "right", OpenXmlNamespaces.WordprocessingML);
-		//    appendBorderAttributes(brcRight, rightBorder);
-		//    addOrSetBorder(_tblBorders, rightBorder);
-		//}
-		//if (brcHorz != null)
-		//{
-		//     XmlNode insideHBorder = _nodeFactory.CreateNode(XmlNodeType.Element, "w", "insideH", OpenXmlNamespaces.WordprocessingML);
-		//     appendBorderAttributes(brcHorz, insideHBorder);
-		//     addOrSetBorder(_tblBorders, insideHBorder);
-		//}
-		//if (brcVert != null)
-		//{
-		//    XmlNode insideVBorder = _nodeFactory.CreateNode(XmlNodeType.Element, "w", "insideV", OpenXmlNamespaces.WordprocessingML);
-		//    appendBorderAttributes(brcVert, insideVBorder);
-		//    addOrSetBorder(_tblBorders, insideVBorder);
-		//}
-		//if (_tblBorders.ChildNodes.Count > 0)
-		//{
-		//    _tblPrEx.AppendChild(_tblBorders);
-		//}
-
-		//set exceptions
+		XMLTools::XMLElement* _tblBorders = new XMLTools::XMLElement(L"w:tblBorders");
+		if (brcTop)
+		{
+			XMLTools::XMLElement border(L"w:top");
+			appendBorderAttributes(brcTop.get(), &border);
+			addOrSetBorder(_tblBorders, &border);
+		}
+		if (brcLeft)
+		{
+			XMLTools::XMLElement border(L"w:left");
+			appendBorderAttributes(brcLeft.get(), &border);
+			addOrSetBorder(_tblBorders, &border);
+		}
+		if (brcBottom)
+		{
+			XMLTools::XMLElement border(L"w:left");
+			appendBorderAttributes(brcBottom.get(), &border);
+			addOrSetBorder(_tblBorders, &border);
+		}
+		if (brcRight)
+		{
+			XMLTools::XMLElement border(L"w:right");
+			appendBorderAttributes(brcRight.get(), &border);
+			addOrSetBorder(_tblBorders, &border);
+		}
+		if (brcHorz)
+		{
+			XMLTools::XMLElement border(L"w:insideH");
+			appendBorderAttributes(brcHorz.get(), &border);
+			addOrSetBorder(_tblBorders, &border);
+		}
+		if (brcVert)
+		{
+			XMLTools::XMLElement border(L"w:insideV");
+			appendBorderAttributes(brcHorz.get(), &border);
+			addOrSetBorder(_tblBorders, &border);
+		}
+		if (_tblBorders->GetChildCount() > 0)
+		{
+			_tblPrEx->AppendChild(*_tblBorders);
+		}
+//---------------------------------------------------------------------------		
 		if ( _tblPrEx->GetChildCount() > 0 )
 		{
-			_trPr->AppendChild( *(_tblPrEx) );
+			m_pXmlWriter->WriteString(_tblPrEx->GetXMLString());
 		}
-
-		//write Properties
 		if ( ( _trPr->GetChildCount() > 0 ) || ( _trPr->GetAttributeCount() > 0 ) )
 		{
 			m_pXmlWriter->WriteString( _trPr->GetXMLString() );

ASCOfficeDocFile/DocDocxConverter/Tbkd.h

@@ -39,16 +39,16 @@ namespace DocFileFormat
 	class Tbkd : public ByteStructure
 	{
 	public:
+		friend class TextboxMapping;
+
 		static const int STRUCTURE_SIZE = 6;
 
 		Tbkd() : ipgd(0), itxbxs(0), dcpDepend(0), icol(0), fTableBreak(false), fColumnBreak(false), fMarked(false), fUnk(false), fTextOverflow(false)
 		{
-
 		}
 
 		virtual ~Tbkd()
 		{
-
 		}
 
 		virtual ByteStructure* ConstructObject (VirtualStreamReader* reader, int length)
@@ -72,7 +72,7 @@ namespace DocFileFormat
 		}
 
 	private:
-
+		bool bUsed = false;
 		/// Except in textbox BKD, index to PGD in plfpgd that describes the page this break is on
 		short ipgd;
 		/// In textbox BKD

ASCOfficeDocFile/DocDocxConverter/TextboxMapping.cpp

@@ -83,102 +83,102 @@ namespace DocFileFormat
 	{
 		m_document = static_cast<WordDocument*>(visited);
 
-		if (m_document)
+		if (!m_document) return;
+
+		m_pXmlWriter->WriteNodeBegin(L"v:textbox", true);
+		if (m_dxTextLeft >= 0 && m_dyTextTop >= 0 && m_dxTextRight >= 0 && m_dyTextBottom >= 0)
 		{
-			//if (m_nTBIndex < m_document->TextboxBreakPlex->Elements.size())
-			//	return;
-
-            m_pXmlWriter->WriteNodeBegin(L"v:textbox", true);
-				if(m_dxTextLeft >= 0 && m_dyTextTop >= 0 && m_dxTextRight >= 0 && m_dyTextBottom >= 0)
-				{
-                    m_pXmlWriter->WriteAttribute( L"inset" , FormatUtils::DoubleToWideString(m_dxTextLeft)  + L"pt," +
-                                                            FormatUtils::DoubleToWideString(m_dyTextTop)    + L"pt," +
-                                                            FormatUtils::DoubleToWideString(m_dxTextRight)  + L"pt," +
-                                                            FormatUtils::DoubleToWideString(m_dyTextBottom) + L"pt");
-				}
-				if (!m_sTextBoxStyle.empty())
-				{
-                    m_pXmlWriter->WriteAttribute( L"style", m_sTextBoxStyle);
-				}
-            m_pXmlWriter->WriteNodeEnd( L"", true, false );
-			
-            m_pXmlWriter->WriteNodeBegin( L"w:txbxContent" );
-
-			int cp		=	0;
-			int cpEnd	=	0;
-			Tbkd* bkd	=	NULL;
-
-			int txtbxSubdocStart	=	
-				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	;
-	
-			if (typeid(*_caller) == typeid(MainDocumentMapping))
-			{
-				if (m_nTBIndex < m_document->TextboxBreakPlex->Elements.size() )//file(21).doc
-				{
-					bkd		=	static_cast<Tbkd*>(m_document->TextboxBreakPlex->Elements[m_nTBIndex]);
-				}
-
-				if (m_nTBIndex + 1 < m_document->TextboxBreakPlex->CharacterPositions.size())
-				{				
-					cp		=	txtbxSubdocStart + m_document->TextboxBreakPlex->CharacterPositions[m_nTBIndex];
-					cpEnd	=	txtbxSubdocStart + m_document->TextboxBreakPlex->CharacterPositions[m_nTBIndex + 1];
-				}
-				else if (m_nTBIndex + 1 < m_document->TextboxIndividualPlex->CharacterPositions.size())
-				{
-					//todooo сделать чище
-					cp		=	m_document->TextboxIndividualPlex->CharacterPositions[m_nTBIndex] + 2;
-					cpEnd	=	m_document->TextboxIndividualPlex->CharacterPositions[m_nTBIndex + 1];
-				}
-			}
-			else if ((typeid(*_caller) == typeid(HeaderMapping)) || (typeid(*_caller) == typeid(FooterMapping)))
-			{
-				txtbxSubdocStart	+=	m_document->FIB->m_RgLw97.ccpTxbx;
-				
-				bkd			=	static_cast<Tbkd*>(m_document->TextboxBreakPlexHeader->Elements[m_nTBIndex]);
-			
-				cp			=	txtbxSubdocStart + m_document->TextboxBreakPlexHeader->CharacterPositions[m_nTBIndex];
-				cpEnd		=	txtbxSubdocStart + m_document->TextboxBreakPlexHeader->CharacterPositions[m_nTBIndex + 1];
-			}
-
-			_isTextBoxContent = true;
-
-			//convert the textbox text
-			_lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0];
-
-			ParagraphPropertyExceptions* papx_prev = NULL;
-			while (cp < cpEnd)
-			{
-				int fc = m_document->FindFileCharPos(cp);
-				if (fc < 0) break;
-
-				ParagraphPropertyExceptions* papx = findValidPapx( fc );
-				if (papx_prev && papx_prev == papx)//file(21).doc
-					break;
-				papx_prev = papx;
-
-				TableInfo tai( papx, m_document->nWordVersion );
-
-				if ( tai.fInTable )
-				{
-					//this PAPX is for a table
-					Table table( this, cp, ( ( tai.iTap > 0 ) ? ( 1 ) : ( 0 ) ) );
-					table.Convert( this );
-					cp = table.GetCPEnd();
-				}
-				else
-				{
-					//this PAPX is for a normal paragraph
-					cp = writeParagraph( cp, 0x7fffffff );
-				}
-			}
-			_isTextBoxContent = false;
-
-            m_pXmlWriter->WriteNodeEnd( L"w:txbxContent" );
-            m_pXmlWriter->WriteNodeEnd( L"v:textbox" );
+			m_pXmlWriter->WriteAttribute(L"inset", FormatUtils::DoubleToWideString(m_dxTextLeft) + L"pt," +
+				FormatUtils::DoubleToWideString(m_dyTextTop) + L"pt," +
+				FormatUtils::DoubleToWideString(m_dxTextRight) + L"pt," +
+				FormatUtils::DoubleToWideString(m_dyTextBottom) + L"pt");
 		}
+		if (!m_sTextBoxStyle.empty())
+		{
+			m_pXmlWriter->WriteAttribute(L"style", m_sTextBoxStyle);
+		}
+		m_pXmlWriter->WriteNodeEnd(L"", true, false);
+
+		m_pXmlWriter->WriteNodeBegin(L"w:txbxContent");
+
+		int cpStart = 0;
+		int cpEnd = 0;
+		Tbkd* bkd = NULL;
+
+		int txtbxSubdocStart =
+			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;
+
+		if (typeid(*_caller) == typeid(MainDocumentMapping))
+		{
+			if (m_nTBIndex < m_document->TextboxBreakPlex->Elements.size())//file(21).doc
+			{
+				bkd = static_cast<Tbkd*>(m_document->TextboxBreakPlex->Elements[m_nTBIndex]);
+			}
+			
+			if (m_nTBIndex + 1 < m_document->TextboxIndividualPlex->CharacterPositions.size())
+			{//Jukivka.doc
+				cpStart = txtbxSubdocStart + m_document->TextboxIndividualPlex->CharacterPositions[m_nTBIndex];
+				cpEnd = txtbxSubdocStart + m_document->TextboxIndividualPlex->CharacterPositions[m_nTBIndex + 1];
+			}		
+			else if (m_nTBIndex + 1 < m_document->TextboxBreakPlex->CharacterPositions.size())
+			{
+				cpStart = txtbxSubdocStart + m_document->TextboxBreakPlex->CharacterPositions[m_nTBIndex];
+				cpEnd = txtbxSubdocStart + m_document->TextboxBreakPlex->CharacterPositions[m_nTBIndex + 1];
+			}
+
+		}
+		else if ((typeid(*_caller) == typeid(HeaderMapping)) || (typeid(*_caller) == typeid(FooterMapping)))
+		{
+			txtbxSubdocStart += m_document->FIB->m_RgLw97.ccpTxbx;
+
+			bkd = static_cast<Tbkd*>(m_document->TextboxBreakPlexHeader->Elements[m_nTBIndex]);
+
+			cpStart = txtbxSubdocStart + m_document->TextboxBreakPlexHeader->CharacterPositions[m_nTBIndex];
+			cpEnd = txtbxSubdocStart + m_document->TextboxBreakPlexHeader->CharacterPositions[m_nTBIndex + 1];
+		}
+		bool bUsed = bkd ? bkd->bUsed : false;
+		_isTextBoxContent = true;
+
+		//convert the textbox text
+		_lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0];
+
+		ParagraphPropertyExceptions* papx_prev = NULL;
+		int cp = cpStart;
+		while (cp < cpEnd && cp >= cpStart && !bUsed)
+		{
+			int fc = m_document->FindFileCharPos(cp);
+			if (fc < 0) break;
+
+			ParagraphPropertyExceptions* papx = findValidPapx(fc);
+			if (papx_prev && papx_prev == papx)//file(21).doc
+				break;
+			papx_prev = papx;
+
+			TableInfo tai(papx, m_document->nWordVersion);
+
+			if (tai.fInTable)
+			{
+				//this PAPX is for a table
+				Table table(this, cp, ((tai.iTap > 0) ? (1) : (0)));
+				table.Convert(this);
+				cp = table.GetCPEnd();
+			}
+			else
+			{
+				//this PAPX is for a normal paragraph
+				cp = writeParagraph(cp, 0x7fffffff);
+			}
+		}
+		_isTextBoxContent = false;
+
+		if (bkd)
+			bkd->bUsed = true;
+
+		m_pXmlWriter->WriteNodeEnd(L"w:txbxContent");
+		m_pXmlWriter->WriteNodeEnd(L"v:textbox");
 	}
 }

ASCOfficeDocFile/DocDocxConverter/TextboxMapping.h

@@ -39,7 +39,6 @@ namespace DocFileFormat
 	class TextboxMapping : public DocumentMapping
 	{
 	public:
-
 		TextboxMapping(ConversionContext* ctx, int textboxIndex, XMLTools::CStringXmlWriter* writer, IMapping* caller);
 		TextboxMapping(ConversionContext* ctx, XMLTools::CStringXmlWriter* writer, IMapping* caller);
 		

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -319,7 +319,7 @@ namespace DocFileFormat
 		for (size_t i = 0; i < options.size(); i++)
 		{
 			ODRAW::OfficeArtFOPTEPtr & iter = options[i];
-			switch ( iter->opid )
+			switch (iter->opid)
 			{
 			case wzEquationXML:
 				{
@@ -328,10 +328,10 @@ namespace DocFileFormat
 					{
 						m_isEquation = true;
 						m_isEmbedded = true;
-						
+
 						m_embeddedData = pXml->data;
 
-						if (ParseEmbeddedEquation( m_embeddedData, m_equationXml))
+						if (ParseEmbeddedEquation(m_embeddedData, m_equationXml))
 						{
 							m_isEmbedded = false;
 						}
@@ -341,74 +341,74 @@ namespace DocFileFormat
 				{//встроенная неведомая хуйня
 					ODRAW::MetroBlob* blob = dynamic_cast<ODRAW::MetroBlob*>(iter.get());
 					if (blob)
-					{						
-						m_isBlob		= true;
-						m_isEmbedded	= true;
+					{
+						m_isBlob = true;
+						m_isEmbedded = true;
 						//if (ParseEmbeddedBlob( blob->data.first, blob->data.second)) // todoooo
 						//{
 						//	m_isEmbedded = false;
 						//}
 					}
 				}break;
-//BORDERS
+			//BORDERS
 			case ODRAW::borderBottomColor:
 				if (!pict->brcBottom)
 				{
-					RGBColor bottomColor( (int)iter->op, RedFirst );
-					m_pXmlWriter->WriteAttribute( L"o:borderbottomcolor", L"#" + bottomColor.SixDigitHexCode);
+					RGBColor bottomColor((int)iter->op, RedFirst);
+					m_pXmlWriter->WriteAttribute(L"o:borderbottomcolor", L"#" + bottomColor.SixDigitHexCode);
 				}
 				break;
 			case ODRAW::borderLeftColor:
 				if (!pict->brcLeft)
-				{  
-					RGBColor leftColor( (int)iter->op, RedFirst );
-					m_pXmlWriter->WriteAttribute( L"o:borderleftcolor", L"#" + leftColor.SixDigitHexCode);
-				}  
+				{
+					RGBColor leftColor((int)iter->op, RedFirst);
+					m_pXmlWriter->WriteAttribute(L"o:borderleftcolor", L"#" + leftColor.SixDigitHexCode);
+				}
 				break;
 			case ODRAW::borderRightColor:
 				if (!pict->brcRight)
-				{  
-					RGBColor rightColor( (int)iter->op, RedFirst );
-					m_pXmlWriter->WriteAttribute( L"o:borderrightcolor",  L"#" + rightColor.SixDigitHexCode);
+				{
+					RGBColor rightColor((int)iter->op, RedFirst);
+					m_pXmlWriter->WriteAttribute(L"o:borderrightcolor", L"#" + rightColor.SixDigitHexCode);
 				}
 				break;
 			case ODRAW::borderTopColor:
 				if (!pict->brcTop)
 				{
-					RGBColor topColor( (int)iter->op, RedFirst );
-					m_pXmlWriter->WriteAttribute( L"o:bordertopcolor", L"#" + topColor.SixDigitHexCode);
+					RGBColor topColor((int)iter->op, RedFirst);
+					m_pXmlWriter->WriteAttribute(L"o:bordertopcolor", L"#" + topColor.SixDigitHexCode);
 				}
 				break;
-//CROPPING
+				//CROPPING
 			case ODRAW::cropFromBottom:
-				{  
+				{
 					//cast to signed integer
 					int cropBottom = (int)iter->op;
-					appendValueAttribute(m_imageData, L"cropbottom", FormatUtils::IntToWideString( cropBottom ) + L"f" );
+					appendValueAttribute(m_imageData, L"cropbottom", FormatUtils::IntToWideString(cropBottom) + L"f");
 				}
 				break;
 			case ODRAW::cropFromLeft:
-				{  
+				{
 					//cast to signed integer
 					int cropLeft = (int)iter->op;
-					appendValueAttribute(m_imageData, L"cropleft", FormatUtils::IntToWideString( cropLeft ) + L"f" );
+					appendValueAttribute(m_imageData, L"cropleft", FormatUtils::IntToWideString(cropLeft) + L"f");
 				}
 				break;
 			case ODRAW::cropFromRight:
 				{
 					//cast to signed integer
 					int cropRight = (int)iter->op;
-					appendValueAttribute(m_imageData, L"cropright", FormatUtils::IntToWideString( cropRight ) + L"f" );
+					appendValueAttribute(m_imageData, L"cropright", FormatUtils::IntToWideString(cropRight) + L"f");
 				}
 				break;
 			case ODRAW::cropFromTop:
 				{
 					//cast to signed integer
 					int cropTop = (int)iter->op;
-					appendValueAttribute(m_imageData, L"croptop", FormatUtils::IntToWideString( cropTop ) + L"f" );
+					appendValueAttribute(m_imageData, L"croptop", FormatUtils::IntToWideString(cropTop) + L"f");
 				}
 				break;
-//------------------------------------------------------------
+			//------------------------------------------------------------
 			case ODRAW::ePropertyId_rotation:
 				{
 					double dAngle = (double)((int)iter->op) / 65535.0;
@@ -427,7 +427,8 @@ namespace DocFileFormat
 				}break;
 			case ODRAW::posrelh:
 				{
-					appendStyleProperty(strStyle, L"mso-position-horizontal-relative", VMLShapeMapping::mapHorizontalPositionRelative((PositionHorizontalRelative)iter->op));
+					if (false == m_inGroup)
+						appendStyleProperty(strStyle, L"mso-position-horizontal-relative", VMLShapeMapping::mapHorizontalPositionRelative((PositionHorizontalRelative)iter->op));
 				}break;
 			case ODRAW::posv:
 				{
@@ -435,7 +436,8 @@ namespace DocFileFormat
 				}break;
 			case ODRAW::posrelv:
 				{
-					appendStyleProperty(strStyle, L"mso-position-vertical-relative", VMLShapeMapping::mapVerticalPositionRelative((PositionVerticalRelative)iter->op));
+					if (false == m_inGroup)
+						appendStyleProperty(strStyle, L"mso-position-vertical-relative", VMLShapeMapping::mapVerticalPositionRelative((PositionVerticalRelative)iter->op));
 				}break;
 			case ODRAW::groupShapeBooleanProperties:
 				{
@@ -444,7 +446,7 @@ namespace DocFileFormat
 					if (booleans->fUsefBehindDocument && booleans->fBehindDocument)
 					{
 						//The shape is behind the text, so the z-index must be negative.
-						appendStyleProperty(strStyle, L"z-index", L"-1" );
+						appendStyleProperty(strStyle, L"z-index", L"-1");
 					}
 					//else if (!m_isInlinePicture)
 					//{
@@ -456,8 +458,20 @@ namespace DocFileFormat
 						appendStyleProperty(strStyle, L"visibility", L"hidden");
 					}
 				}break;
+			case ODRAW::blipBooleanProperties:
+				{
+					ODRAW::BlipBooleanProperties * bools = (ODRAW::BlipBooleanProperties *)(iter.get());
+					if (bools)
+					{
+						if (bools->fUsefPictureGray && bools->fPictureGray)
+							appendValueAttribute(m_imageData, L"grayscale", L"t");
+						if (bools->fUsefPictureBiLevel && bools->fPictureBiLevel)
+							appendValueAttribute(m_imageData, L"bilevel", L"t");
+					}
+				}break;
 			default:
-				break;				
+				{
+				}break;
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -45,6 +45,7 @@
 #include "../../DesktopEditor/common/StringExt.h"
 
 #include "../Common/FormatUtils.h"
+#include "../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h"
 
 namespace DocFileFormat
 {
@@ -152,8 +153,8 @@ namespace DocFileFormat
 			bool twistDimensions = false;
 
 			m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(shape, anchor, options, container->Index, twistDimensions)));
-			m_pXmlWriter->WriteAttribute( L"coordorigin", ( FormatUtils::IntToWideString(gsr->rcgBounds.topLeftAngle.x) + L"," + FormatUtils::IntToWideString( gsr->rcgBounds.topLeftAngle.y)));
-			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString(gsr->rcgBounds.size.cx) + L"," + FormatUtils::IntToWideString(gsr->rcgBounds.size.cy)));
+            m_pXmlWriter->WriteAttribute( L"coordorigin", ( std::to_wstring(gsr->rcgBounds.topLeftAngle.x) + L"," + std::to_wstring( gsr->rcgBounds.topLeftAngle.y)));
+            m_pXmlWriter->WriteAttribute( L"coordsize", ( std::to_wstring(gsr->rcgBounds.size.cx) + L"," + std::to_wstring(gsr->rcgBounds.size.cy)));
 
 			// Write wrap coords			
 			for (size_t i = 0; i < options.size(); i++)
@@ -251,7 +252,7 @@ namespace DocFileFormat
 		if (m_shapeId.empty())
 		{
 			m_context->_doc->GetOfficeArt()->m_uLastShapeId++;
-			m_shapeId =	std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
+            m_shapeId =	std::wstring(L"_x0000_s") + std::to_wstring(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
 		}
 		
 		m_pXmlWriter->WriteAttribute ( L"id", m_shapeId );
@@ -291,8 +292,8 @@ namespace DocFileFormat
 		boost::optional<double> viewPointOriginY;
 		boost::optional<double> ShadowOriginX;
 		boost::optional<double> ShadowOriginY;
-		boost::optional<unsigned int> xCoord;
-		boost::optional<unsigned int> yCoord;
+        boost::optional<size_t> xCoord;
+        boost::optional<size_t> yCoord;
 		
 		bool bStroked			=	true;
 		bool bFilled			=	true;
@@ -312,6 +313,8 @@ namespace DocFileFormat
 		int	nAdjValues			=	0;
 		int	nLTxID				=	-1;
 
+		int nProperty = 0;
+
 		std::wstring				sTextboxStyle;
 				
 		ODRAW::OfficeArtFOPTEPtr	opSegmentInfo;
@@ -564,7 +567,8 @@ namespace DocFileFormat
 			}break;
 			case ODRAW::fillFocus:
 			{
-				appendValueAttribute(&m_fill, L"focus", (FormatUtils::IntToWideString(iter->op) + L"%"));
+                appendValueAttribute(&m_fill, L"focus", (std::to_wstring(iter->op) + L"%"));
+				appendValueAttribute(&m_fill, L"focusposition", L".5, .5");
 				appendValueAttribute(&m_fill, L"focussize", L"");
 			}break;
 			case ODRAW::fillType:
@@ -587,7 +591,7 @@ namespace DocFileFormat
 
 				if ((pFillBlip != NULL) && copyPicture(pFillBlip))
 				{
-					appendValueAttribute(&m_fill, L"r:id", std::wstring((L"rId") + FormatUtils::IntToWideString(m_nImageId)));
+                    appendValueAttribute(&m_fill, L"r:id", std::wstring((L"rId") + std::to_wstring(m_nImageId)));
 				}
 
 				bPicturePresent = true;
@@ -602,12 +606,14 @@ namespace DocFileFormat
 			}break;
 			case ODRAW::fillOpacity:
 			{
-				appendValueAttribute(&m_fill, L"opacity", (FormatUtils::IntToWideString(iter->op) + L"f"));
+				double opa = (iter->op / pow((double)2, (double)16));
+				appendValueAttribute(&m_fill, L"opacity", FormatUtils::DoubleToFormattedWideString(opa, L"%.2f"));
 			}
 			break;
 			case ODRAW::fillBackOpacity:
 			{
-				appendValueAttribute(&m_fill, L"o:opacity2", (FormatUtils::IntToWideString(iter->op) + L"f"));
+				double opa = (iter->op / pow((double)2, (double)16));
+				appendValueAttribute(&m_fill, L"o:opacity2", FormatUtils::DoubleToFormattedWideString(opa, L"%.2f"));
 			}break;
 	// SHADOW
 			case ODRAW::shadowType:
@@ -652,8 +658,14 @@ namespace DocFileFormat
 			}break;
 			case ODRAW::shadowStyleBooleanProperties:
 			{
-				//ODRAW::ShadowStyleBooleanProperties
-
+				ODRAW::ShadowStyleBooleanProperties* booleans = dynamic_cast<ODRAW::ShadowStyleBooleanProperties*>(iter.get());
+				if (booleans)
+				{
+					if (booleans->fUsefShadow && booleans->fShadow)
+					{
+						bShadow = true;
+					}
+				}
 			}break;
 	// OLE
 			case ODRAW::pictureId:
@@ -670,7 +682,7 @@ namespace DocFileFormat
 					BlipStoreEntry* oBlip = static_cast<BlipStoreEntry*>(m_pBlipStore->Children[index]);
 					if (copyPicture(oBlip))
 					{
-						appendValueAttribute(&m_imagedata, L"r:id", (std::wstring(L"rId") + FormatUtils::IntToWideString(m_nImageId)));
+                        appendValueAttribute(&m_imagedata, L"r:id", (std::wstring(L"rId") + std::to_wstring(m_nImageId)));
 					}
 				}
 				bPicturePresent = true;
@@ -689,43 +701,43 @@ namespace DocFileFormat
 			}break;
 			case ODRAW::pictureContrast:
 			{
-				appendValueAttribute(&m_imagedata, L"gain", (FormatUtils::IntToWideString(iter->op) + L"f"));
+                appendValueAttribute(&m_imagedata, L"gain", (std::to_wstring(iter->op) + L"f"));
 			}break;
 			case ODRAW::pictureBrightness:
 			{
-				appendValueAttribute(&m_imagedata, L"blacklevel", (FormatUtils::IntToWideString(iter->op) + L"f"));
+                appendValueAttribute(&m_imagedata, L"blacklevel", (std::to_wstring(iter->op) + L"f"));
 			}break;
 			case ODRAW::pictureGamma:
 			{
-				appendValueAttribute(&m_imagedata, L"gamma", (FormatUtils::IntToWideString(iter->op) + L"f"));
+                appendValueAttribute(&m_imagedata, L"gamma", (std::to_wstring(iter->op) + L"f"));
 			}break;
 			//CROPPING
 			case ODRAW::cropFromBottom:
 			{
 				//cast to signed integer
 				int cropBottom = (int)iter->op;
-				appendValueAttribute(&m_imagedata, L"cropbottom", FormatUtils::IntToWideString(cropBottom) + L"f");
+                appendValueAttribute(&m_imagedata, L"cropbottom", std::to_wstring(cropBottom) + L"f");
 			}
 			break;
 			case ODRAW::cropFromLeft:
 			{
 				//cast to signed integer
 				int cropLeft = (int)iter->op;
-				appendValueAttribute(&m_imagedata, L"cropleft", FormatUtils::IntToWideString(cropLeft) + L"f");
+                appendValueAttribute(&m_imagedata, L"cropleft", std::to_wstring(cropLeft) + L"f");
 			}
 			break;
 			case ODRAW::cropFromRight:
 			{
 				//cast to signed integer
 				int cropRight = (int)iter->op;
-				appendValueAttribute(&m_imagedata, L"cropright", FormatUtils::IntToWideString(cropRight) + L"f");
+                appendValueAttribute(&m_imagedata, L"cropright", std::to_wstring(cropRight) + L"f");
 			}
 			break;
 			case ODRAW::cropFromTop:
 			{
 				//cast to signed integer
 				int cropTop = (int)iter->op;
-				appendValueAttribute(&m_imagedata, L"croptop", FormatUtils::IntToWideString(cropTop) + L"f");
+                appendValueAttribute(&m_imagedata, L"croptop", std::to_wstring(cropTop) + L"f");
 			}
 			break;
 // 3D STYLE
@@ -751,22 +763,22 @@ namespace DocFileFormat
 				}break; 
 			case ODRAW::c3DAmbientIntensity:
 				{
-					std::wstring intens = FormatUtils::IntToWideString((int)iter->op) + L"f";
+                    std::wstring intens = std::to_wstring((int)iter->op) + L"f";
 					appendValueAttribute(&m_3dstyle, L"brightness", intens);
 				}break; 
 			case ODRAW::c3DSpecularAmt:
 				{
-					std::wstring amt = FormatUtils::IntToWideString((int)iter->op) + L"f";
+                    std::wstring amt = std::to_wstring((int)iter->op) + L"f";
 					appendValueAttribute(&m_3dstyle, L"specularity", amt);
 				}break; 
 			case ODRAW::c3DDiffuseAmt:
 				{
-					std::wstring amt = FormatUtils::IntToWideString((int)iter->op) + L"f";
+                    std::wstring amt = std::to_wstring((int)iter->op) + L"f";
 					appendValueAttribute(&m_3dstyle, L"diffusity", amt);
 				}break; 
 			case ODRAW::c3DKeyIntensity:
 				{
-					std::wstring amt = FormatUtils::IntToWideString((int)iter->op);
+                    std::wstring amt = std::to_wstring((int)iter->op);
 					appendValueAttribute(&m_3dstyle, L"lightlevel", amt);
 				}break; 	
 			case ODRAW::c3DExtrusionColor:
@@ -832,6 +844,10 @@ namespace DocFileFormat
 						break;
 					}
 				}break;	
+			case ODRAW::hspNext:
+				{
+                    appendStyleProperty(sTextboxStyle, L"mso-next-textbox", std::wstring(L"_x0000_s") + std::to_wstring((unsigned int)iter->op));
+				}break;
 			case ODRAW::textBooleanProperties:
 				{
 					ODRAW::TextBooleanProperties *props = dynamic_cast<ODRAW::TextBooleanProperties*>(iter.get());
@@ -841,7 +857,6 @@ namespace DocFileFormat
 						appendStyleProperty(sTextboxStyle, L"mso-fit-shape-to-text", L"t");
 					}
 				}break;
-
 // Word Art
 			case ODRAW::gtextUNICODE:
 				{
@@ -861,18 +876,22 @@ namespace DocFileFormat
 				}break;
 			case ODRAW::gtextSize:
 				{
-					std::wstring fontSize = FormatUtils::IntToWideString(iter->op/65535);
+                    std::wstring fontSize = std::to_wstring(iter->op/65535);
 					appendStyleProperty(m_textPathStyle, L"font-size", fontSize + L"pt");
 				}break;
 			case ODRAW::gtextSpacing:
 				{
-					std::wstring spacing = FormatUtils::IntToWideString(iter->op);
+                    std::wstring spacing = std::to_wstring(iter->op);
 					appendStyleProperty(m_textPathStyle, L"v-text-spacing", spacing + L"f");
 				}break;
 			case ODRAW::geometryTextBooleanProperties:
 				{
 					ODRAW::GeometryTextBooleanProperties *props = dynamic_cast<ODRAW::GeometryTextBooleanProperties*>(iter.get());
-					if (props->fUsegFBestFit && props->fBestFit)
+					if (props->fUsegFShrinkFit && props->fShrinkFit && (props->fStretch || props->fUsegFStretch))
+					{
+						appendValueAttribute(&m_textpath, L"fitshape", L"t");
+					}
+					if (props->fUsegFBestFit && props->fBestFit && (!props->fStretch || !props->fUsegFStretch))
 					{
 						appendValueAttribute(&m_textpath, L"fitshape", L"t");
 					}
@@ -900,7 +919,7 @@ namespace DocFileFormat
 				}break;
 			default:
 				{
-					int val = iter->op;
+					nProperty = iter->op;
 				}break;
 			}
 		}
@@ -909,7 +928,7 @@ namespace DocFileFormat
 		ODRAW::PSegmentInfo*	pSI	= dynamic_cast<ODRAW::PSegmentInfo*>(opSegmentInfo.get());
 		if (pVP && pSI)
 		{		
-			ODRAW::PathParser oParser (pSI->complex.data, pVP->complex.data, m_arrGuides);
+			ODRAW::PathParser oParser (pSI->complex.data, pVP->complex.data, m_arrGuides, xCoord, yCoord);
 			std::wstring path = oParser.GetVmlPath();
 
 			if (false == path.empty())
@@ -937,13 +956,13 @@ namespace DocFileFormat
 
 		if ( xCoord && yCoord )
 		{
-			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString( *xCoord ) + L"," + FormatUtils::IntToWideString( *yCoord ) ));
+            m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::SizeTToWideString( *xCoord ) + L"," + FormatUtils::SizeTToWideString( *yCoord ) ));
 		} 
 
 		int nCode =	0;
 		if (pShape->GetShapeType())
 		{
-			nCode =	pShape->GetShapeType()->GetTypeCode();
+            nCode =	pShape->GetShapeType()->GetTypeCode();
 		}
 
 		if (DocFileFormat::msosptRoundRectangle == nCode)
@@ -1020,13 +1039,6 @@ namespace DocFileFormat
 			appendValueAttribute(&m_shadow, L"origin", FormatUtils::DoubleToWideString(*ShadowOriginX) + std::wstring(L"," ) + FormatUtils::DoubleToWideString(*ShadowOriginY));
 		}
 
-// write shadow
-		if (m_shadow.GetAttributeCount() > 0)
-		{
-			appendValueAttribute(&m_shadow, L"on", bShadow ? L"t" : L"f" );
-			m_pXmlWriter->WriteString(m_shadow.GetXMLString());
-		}
-
 //write the viewpoint
 		if ( ViewPointX || ViewPointY || ViewPointZ )
 		{
@@ -1034,17 +1046,17 @@ namespace DocFileFormat
 
 			if ( ViewPointX )
 			{
-				viewPoint += FormatUtils::IntToWideString( *ViewPointX ) + L"pt";
+                viewPoint += std::to_wstring( *ViewPointX ) + L"pt";
 			}
 			viewPoint += L",";
 			if ( ViewPointY)
 			{
-				viewPoint += FormatUtils::IntToWideString( *ViewPointY ) + L"pt";
+                viewPoint += std::to_wstring( *ViewPointY ) + L"pt";
 			}
 			viewPoint += L",";
 			if ( ViewPointZ)
 			{
-				viewPoint += FormatUtils::IntToWideString( *ViewPointZ ) + L"pt";
+                viewPoint += std::to_wstring( *ViewPointZ ) + L"pt";
 			}
 
 			appendValueAttribute(&m_3dstyle, L"viewpoint", viewPoint);
@@ -1095,6 +1107,13 @@ namespace DocFileFormat
 		{
 			m_pXmlWriter->WriteString(m_fill.GetXMLString());
 		}		
+
+// write shadow
+		if (m_shadow.GetAttributeCount() > 0)
+		{
+			appendValueAttribute(&m_shadow, L"on", bShadow ? L"t" : L"f");
+			m_pXmlWriter->WriteString(m_shadow.GetXMLString());
+		}
 // write imagedata
 		if (m_imagedata.GetAttributeCount())
 		{
@@ -1149,8 +1168,8 @@ namespace DocFileFormat
 			//Word appends a OfficeArtClientTextbox record to the container. 
 			//This record stores the index of the textbox.
 
-			int nIndex = pTextBox->GetIndex();
-			if (nIndex)
+			int nIndex = pTextBox->m_nIndex;
+			if (nIndex > 0)
 			{
 				TextboxMapping textboxMapping(m_context, nIndex - 1, m_pXmlWriter, m_pCaller);
 				textboxMapping.SetInset(ndxTextLeft, ndyTextTop, ndxTextRight, ndyTextBottom);
@@ -1161,12 +1180,6 @@ namespace DocFileFormat
 		}
 		else if( hasTextbox )
 		{
-			//Open Office textbox
-
-			//Open Office doesn't append a OfficeArtClientTextbox record to the container.
-			//We don't know how Word gets the relation to the text, but we assume that the first textbox in the document
-			//get the index 0, the second textbox gets the index 1 (and so on).
-
 			if (-1 != nLTxID)
 			{
 				TextboxMapping textboxMapping(m_context, nLTxID - 1, m_pXmlWriter, m_pCaller);
@@ -1281,7 +1294,7 @@ namespace DocFileFormat
 		if (NULL != pShape)
 		{
 			strXmlAttr += std::wstring(L"_x0000_s");
-			strXmlAttr += FormatUtils::IntToWideString(pShape->GetShapeID());
+            strXmlAttr += std::to_wstring(pShape->GetShapeID());
 		}
 
 		return strXmlAttr;
@@ -1308,9 +1321,9 @@ namespace DocFileFormat
 				top		=	(bottom	+	pAnchor->rcgBounds.topLeftAngle.y) * 0.5 - (right	-	pAnchor->rcgBounds.topLeftAngle.x) * 0.5;
 			}
 
-			strXmlFrom += FormatUtils::IntToWideString(left);
+            strXmlFrom += std::to_wstring(left);
 			strXmlFrom += L",";
-			strXmlFrom += FormatUtils::IntToWideString(top);
+            strXmlFrom += std::to_wstring(top);
 		}
 		else if (m_pSpa)
 		{
@@ -1351,9 +1364,9 @@ namespace DocFileFormat
 				right	= left + pAnchor->rcgBounds.size.cy;
 				bottom	= top + pAnchor->rcgBounds.size.cx;
 			}
-			strXmlTo += FormatUtils::IntToWideString(right);
+            strXmlTo += std::to_wstring(right);
 			strXmlTo += L",";
-			strXmlTo += FormatUtils::IntToWideString(bottom);
+            strXmlTo += std::to_wstring(bottom);
 		}
 		else if (m_pSpa)
 		{
@@ -1387,7 +1400,7 @@ namespace DocFileFormat
 
 		for (size_t i = 0; i < pWrapPolygonVertices->complex.data.size(); ++i)
 		{
-			coords += FormatUtils::IntToWideString(pWrapPolygonVertices->complex.data[i].x);
+            coords += std::to_wstring(pWrapPolygonVertices->complex.data[i].x);
 			coords += L",";
 			coords += FormatUtils::IntToWideString(pWrapPolygonVertices->complex.data[i].y);
 			coords += L",";
@@ -1589,19 +1602,19 @@ namespace DocFileFormat
 				bounds.topLeftAngle.y	=	static_cast<LONG>(((anchor->Bottom	+	anchor->Top)  * 0.5 - (anchor->Right	-	anchor->Left) * 0.5));
 			}
 
-			appendStylePropertyFirst(style, L"top",	FormatUtils::IntToWideString(bounds.topLeftAngle.y));
-			appendStylePropertyFirst(style, L"left",	FormatUtils::IntToWideString(bounds.topLeftAngle.x));
+            appendStylePropertyFirst(style, L"top",	std::to_wstring(bounds.topLeftAngle.y));
+            appendStylePropertyFirst(style, L"left",	std::to_wstring(bounds.topLeftAngle.x));
 			appendStylePropertyFirst(style, L"position", L"absolute");
 
 			if (twistDimensions)
 			{
-				appendStylePropertyFirst(style, L"width",	 FormatUtils::IntToWideString(bounds.size.cy));
-				appendStylePropertyFirst(style, L"height", FormatUtils::IntToWideString(bounds.size.cx));
+                appendStylePropertyFirst(style, L"width",	 std::to_wstring(bounds.size.cy));
+                appendStylePropertyFirst(style, L"height", std::to_wstring(bounds.size.cx));
 			}
 			else
 			{
-				appendStylePropertyFirst(style, L"width",  FormatUtils::IntToWideString(bounds.size.cx));
-				appendStylePropertyFirst(style, L"height", FormatUtils::IntToWideString(bounds.size.cy));
+                appendStylePropertyFirst(style, L"width",  std::to_wstring(bounds.size.cx));
+                appendStylePropertyFirst(style, L"height", std::to_wstring(bounds.size.cy));
 			}
 		}
 	}
@@ -1704,7 +1717,7 @@ namespace DocFileFormat
 		switch (val)
 		{
 		case 0:	return L"square";
-		//case 1:	return L"ByPoints";	
+		case 1:	return L"tight";	
 		case 2:	return L"none";
 		//case 3:	return L"TopBottom";
 		//case 3:	return L"Through";
@@ -1762,7 +1775,7 @@ namespace DocFileFormat
 						//за текстом (The shape is behind the text, so the z-index must be negative.)
 						m_isInlineShape = false;
 
-						if (false == bZIndex && false == m_inGroup)
+						if (false == bZIndex/* && false == m_inGroup*/) // Пример.doc
 						{
 							appendStyleProperty(oStyle, L"z-index", FormatUtils::IntToWideString(-zIndex - 0x7ffff));
 							bZIndex = true;
@@ -1817,7 +1830,7 @@ namespace DocFileFormat
 			}
 		}
 		
-		if (nRelH < 0 && m_pSpa)
+		if (nRelH < 0 && m_pSpa && false == m_inGroup)
 		{
 			//if (m_pSpa->bx == TEXT && bZIndex)
 			//{
@@ -1830,7 +1843,7 @@ namespace DocFileFormat
 			else if (m_pSpa->bx == TEXT)
 				appendStyleProperty(oStyle, L"mso-position-horizontal-relative", mapHorizontalPositionRelative(msoprhText));
 		}
-		if (nRelV < 0 && m_pSpa)
+		if (nRelV < 0 && m_pSpa && false == m_inGroup)
 		{
 			//if (m_pSpa->by == TEXT && bZIndex) 
 			//{
@@ -2029,8 +2042,12 @@ namespace DocFileFormat
 		std::wstring result;
 		for (size_t i = 0; i < pColors->complex.data.size(); ++i)
 		{
-			result += FormatUtils::IntToWideString((int)pColors->complex.data[i].dPosition);
-			result += L"f #";
+			if (pColors->complex.data[i].position.Fractional == 0)
+                result += std::to_wstring(pColors->complex.data[i].position.Integral);
+			else
+                result += std::to_wstring(pColors->complex.data[i].position.Fractional) +L"f";
+
+			result += L" #";
 			result += pColors->complex.data[i].color.sColorRGB;
 			result += L";";
 		}
@@ -2283,7 +2300,7 @@ namespace DocFileFormat
 
 		m_context->_doc->GetOfficeArt()->m_uLastShapeId++;
 
-		std::wstring strId = std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
+        std::wstring strId = std::wstring(L"_x0000_s") + std::to_wstring(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
 		
 		//m_pXmlWriter->WriteAttribute ( L"id")	, strId);
 		m_pXmlWriter->WriteAttribute ( L"o:spid", strId);
@@ -2298,8 +2315,8 @@ namespace DocFileFormat
 			TwipsValue x2( line->xaEnd );
 			TwipsValue y2( line->yaEnd );
 						
-			std::wstring strStart	=  FormatUtils::IntToWideString(line->xaStart + primitive->xa) + L"," + FormatUtils::IntToWideString(line->yaStart + primitive->ya); 
-			std::wstring strEnd		=  FormatUtils::IntToWideString(line->xaEnd + primitive->xa) + L"," + FormatUtils::IntToWideString(line->yaEnd + primitive->ya);
+            std::wstring strStart	=  std::to_wstring(line->xaStart + primitive->xa) + L"," + std::to_wstring(line->yaStart + primitive->ya);
+            std::wstring strEnd		=  std::to_wstring(line->xaEnd + primitive->xa) + L"," + std::to_wstring(line->yaEnd + primitive->ya);
 
 			m_pXmlWriter->WriteAttribute(L"from",  strStart);
 			m_pXmlWriter->WriteAttribute(L"to",	strEnd);
@@ -2308,13 +2325,13 @@ namespace DocFileFormat
 		{
 			if (root)
 			{
-				//strStyle += L"left:"		+ FormatUtils::IntToWideString( x.ToPoints()) + L"pt;";
-				//strStyle += L"top:"		+ FormatUtils::IntToWideString( y.ToPoints()) + L"pt;";
-				strStyle +=	L"width:"		+ FormatUtils::IntToWideString( (int)w.ToPoints()) + L"pt;";
-				strStyle +=	L"height:"		+ FormatUtils::IntToWideString( (int)h.ToPoints()) + L"pt;";
+                //strStyle += L"left:"		+ std::to_wstring( x.ToPoints()) + L"pt;";
+                //strStyle += L"top:"		+ std::to_wstring( y.ToPoints()) + L"pt;";
+                strStyle +=	L"width:"		+ std::to_wstring( (int)w.ToPoints()) + L"pt;";
+                strStyle +=	L"height:"		+ std::to_wstring( (int)h.ToPoints()) + L"pt;";
 
-				strStyle += L"margin-left:"	+ FormatUtils::IntToWideString( (int)x.ToPoints()) + L"pt;";
-				strStyle +=	L"margin-top:"	+ FormatUtils::IntToWideString( (int)y.ToPoints()) + L"pt;";
+                strStyle += L"margin-left:"	+ std::to_wstring( (int)x.ToPoints()) + L"pt;";
+                strStyle +=	L"margin-top:"	+ std::to_wstring( (int)y.ToPoints()) + L"pt;";
 
 				if (false == m_inGroup)
 				{
@@ -2330,18 +2347,18 @@ namespace DocFileFormat
 					if (!yMargin.empty()) strStyle += L"mso-position-vertical-relative:" + yMargin;
 				}
 
-				std::wstring strSize = FormatUtils::IntToWideString(primitive->dxa) + L"," + FormatUtils::IntToWideString(primitive->dya);
-				std::wstring strOrigin = FormatUtils::IntToWideString(primitive->xa) + L"," + FormatUtils::IntToWideString(primitive->ya);
+                std::wstring strSize = std::to_wstring(primitive->dxa) + L"," + std::to_wstring(primitive->dya);
+                std::wstring strOrigin = std::to_wstring(primitive->xa) + L"," + std::to_wstring(primitive->ya);
 				
 				m_pXmlWriter->WriteAttribute( L"coordsize", strSize);
 				//m_pXmlWriter->WriteAttribute( L"coordorigin"), strOrigin);
 			}
 			else
 			{
-				strStyle += L"left:"	+ FormatUtils::IntToWideString( primitive->xa)	+ L";";
-				strStyle += L"top:"		+ FormatUtils::IntToWideString( primitive->ya)	+ L";";
-				strStyle += L"width:"	+ FormatUtils::IntToWideString( primitive->dxa) + L";";
-				strStyle += L"height:"	+ FormatUtils::IntToWideString( primitive->dya) + L";";
+                strStyle += L"left:"	+ std::to_wstring( primitive->xa)	+ L";";
+                strStyle += L"top:"		+ std::to_wstring( primitive->ya)	+ L";";
+                strStyle += L"width:"	+ std::to_wstring( primitive->dxa) + L";";
+                strStyle += L"height:"	+ std::to_wstring( primitive->dya) + L";";
 			}
 		}
 		if (primitive->fillPattern == 0)
@@ -2353,7 +2370,7 @@ namespace DocFileFormat
 		}
 		m_pXmlWriter->WriteAttribute( L"style", strStyle);
 
-		std::wstring strStrokeWeight = FormatUtils::IntToWideString(primitive->lineWeight / 20) + L"pt";
+        std::wstring strStrokeWeight = std::to_wstring(primitive->lineWeight / 20) + L"pt";
 		if (primitive->lineWeight > 20)
 			m_pXmlWriter->WriteAttribute( L"strokeweight", strStrokeWeight);
 
@@ -2374,7 +2391,7 @@ namespace DocFileFormat
 		if (primitive->lineStyle > 1)
 		{
 			m_pXmlWriter->WriteNodeBegin(L"v:stroke", true );
-				std::wstring strDashStyle = FormatUtils::IntToWideString(primitive->lineStyle) + L" 1";
+                std::wstring strDashStyle = std::to_wstring(primitive->lineStyle) + L" 1";
 				m_pXmlWriter->WriteAttribute( L"dashstyle", strDashStyle);
 			m_pXmlWriter->WriteNodeEnd( L"", true, false );
 			m_pXmlWriter->WriteNodeEnd( L"v:stroke" );

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -35,7 +35,7 @@
 #include "../../Common/OfficeFileErrorDescription.h"
 #include "../../Common/MS-LCID.h"
 
-#include "../../ASCOfficeXlsFile2/source/XlsFormat/Logic/SummaryInformationStream/SummaryInformation.h"
+#include "../../ASCOfficeXlsFile2/source/XlsFormat/Logic/SummaryInformationStream/PropertySetStream.h"
 #include "../../ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStream.h"
 
 #include "../../DesktopEditor/common/File.h"
@@ -80,7 +80,7 @@ namespace DocFileFormat
 		254,	437,//PC 437
 		255,	850//OEM
 	};
-	WordDocument::WordDocument (const ProgressCallback* pCallFunc, const std::wstring & sTempFolder, const int userLCID) :	
+	WordDocument::WordDocument (const std::wstring & sTempFolder, const int userLCID) :	
 		m_PieceTable(NULL), WordDocumentStream(NULL), TableStream(NULL), DataStream(NULL),  FIB(NULL), 
 		Text(NULL), RevisionAuthorTable(NULL), FontTable(NULL), BookmarkNames(NULL), AutoTextNames(NULL), 
 		IndividualFootnotesPlex(NULL), FootnoteReferenceCharactersPlex(NULL), IndividualEndnotesPlex(NULL),
@@ -93,7 +93,6 @@ namespace DocFileFormat
 		AnnotationOwners(NULL), DocProperties(NULL), listFormatOverrideTable(NULL), headerAndFooterTable(NULL),
 		AnnotStartPlex(NULL), AnnotEndPlex(NULL), encryptionHeader(NULL)
 	{
-		m_pCallFunc			= pCallFunc;	
 		m_sTempFolder		= sTempFolder;
 		m_nUserLCID			= userLCID;
 		
@@ -241,17 +240,20 @@ namespace DocFileFormat
 		}
 
 //------------------------------------------------------------------------------------------------------------------
-		POLE::Stream			* Summary		= NULL;
-		POLE::Stream			* DocSummary	= NULL;
+		POLE::Stream * Summary		= NULL;
+		POLE::Stream * DocSummary	= NULL;
 		
 		m_pStorage->GetStream (L"SummaryInformation",			&Summary);
 		m_pStorage->GetStream (L"DocumentSummaryInformation",	&DocSummary);
 		
+		OLEPS::PropertySetStream summary_info;
+		
 		if ((Summary) && (Summary->size() > 0))
 		{
-			XLS::CFStreamPtr stream = XLS::CFStreamPtr(new XLS::CFStream(Summary));
-			OLEPS::SummaryInformation summary_info(stream);
-			int document_code_page1 = summary_info.GetCodePage(); //from software last open 
+			XLS::CFStreamPtr stream = XLS::CFStreamPtr(new XLS::CFStream(Summary));			
+			summary_info.read(stream);
+
+			int document_code_page1 = summary_info.GetCodePage(); 
 			
 			if (document_code_page1 > 0)
 			{
@@ -262,8 +264,9 @@ namespace DocFileFormat
 		if ((DocSummary) && (DocSummary->size() > 0))
 		{
 			XLS::CFStreamPtr stream = XLS::CFStreamPtr(new XLS::CFStream(DocSummary));
-			OLEPS::SummaryInformation doc_summary_info(stream);
-			int document_code_page2 = doc_summary_info.GetCodePage();
+			summary_info.read(stream, true);
+
+			int document_code_page2 = summary_info.GetCodePage();
 
 			if (document_code_page2 > 0)
 			{
@@ -289,6 +292,8 @@ namespace DocFileFormat
 				nDocumentCodePage = user_codepage;
 			}
 		}
+		m_sXmlApp = summary_info.GetApp();
+		m_sXmlCore = summary_info.GetCore();
 //-------------------------------------------------------------------------------------------------
 		try
 		{
@@ -315,21 +320,7 @@ namespace DocFileFormat
 
 		BookmarkAnnotNames	=	new StringTable<WideString>		(TableStream, FIB->m_FibWord97.fcSttbfAtnBkmk,		FIB->m_FibWord97.lcbSttbfAtnBkmk,		nWordVersion, true);
 		
-		if (m_pCallFunc)
-		{
-			m_pCallFunc->OnProgress (m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 100000);
-
-			SHORT bCancel = 0;
-			m_pCallFunc->OnProgressEx(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 100000, &bCancel);
-
-			if (bCancel)
-			{
-				Clear();
-				return AVS_ERROR_FILEFORMAT;
-			}
-		}
-
-		// Read all needed PLCFs
+	// Read all needed PLCFs
 		if (FIB->m_RgLw97.ccpFtn > 0)
 		{
 			FootnoteReferenceCharactersPlex	=	new Plex<FootnoteDescriptor>(FootnoteDescriptor::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcffndRef, FIB->m_FibWord97.lcbPlcffndRef, nWordVersion);
@@ -422,20 +413,6 @@ namespace DocFileFormat
 		
 		ListPlex							=	new Plex<ListNumCache>	(ListNumCache::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfBteLvc, FIB->m_FibWord97.lcbPlcfBteLvc, nWordVersion);
 		
-		if (m_pCallFunc)
-		{
-			m_pCallFunc->OnProgress(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 200000 );
-
-			SHORT bCancel = 0;
-			m_pCallFunc->OnProgressEx(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 200000, &bCancel);
-
-			if (bCancel)
-			{
-				Clear();
-				return AVS_ERROR_FILEFORMAT;
-			}
-		}
-
 // Read the FKPs
 		AllPapxFkps				=	FormattedDiskPagePAPX::GetAllPAPXFKPs (FIB, WordDocumentStream, TableStream, DataStream);
 		AllChpxFkps				=	FormattedDiskPageCHPX::GetAllCHPXFKPs (FIB, WordDocumentStream, TableStream);
@@ -452,19 +429,6 @@ namespace DocFileFormat
 			AnnotationOwners		=	new AnnotationOwnerList		(FIB, TableStream);
 		}
 
-        if (m_pCallFunc)
-		{
-			m_pCallFunc->OnProgress(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 300000 );
-
-			SHORT bCancel = 0;
-			m_pCallFunc->OnProgressEx(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 300000, &bCancel);
-
-			if (bCancel)
-			{
-				Clear();
-				return AVS_ERROR_FILEFORMAT;
-			}
-		}
 		if (FontTable)
 		{
 			std::unordered_map<int, int> fonts_charsets;
@@ -556,20 +520,6 @@ namespace DocFileFormat
 
 		std::sort (AllPapxVector->begin(), AllPapxVector->end());
 
-		if (m_pCallFunc)
-		{
-			m_pCallFunc->OnProgress(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 400000 );
-
-			SHORT bCancel = 0;
-			m_pCallFunc->OnProgressEx(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 400000, &bCancel);
-
-			if (bCancel)
-			{
-				Clear();
-				return AVS_ERROR_FILEFORMAT;
-			}
-		}
-
 		//build a dictionary of all SEPX
 		if ( !SectionPlex->Elements.empty() )
 		{
@@ -594,20 +544,6 @@ namespace DocFileFormat
 			}
 		}
 
-		if (m_pCallFunc)
-		{
-			m_pCallFunc->OnProgress(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 500000 );
-
-			SHORT bCancel = 0;
-			m_pCallFunc->OnProgressEx(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 500000, &bCancel);
-
-			if (bCancel)
-			{
-				Clear();
-				return AVS_ERROR_FILEFORMAT;
-			}
-		}
-
 		return 0;
 	}
 	bool WordDocument::LoadDocumentFlat()

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -58,7 +58,6 @@
 #include "EndnoteDescriptor.h"
 #include "FieldCharacter.h"
 #include "IVisitable.h"
-#include "../Common/Callback.h"
 
 namespace CRYPT
 {
@@ -89,10 +88,10 @@ namespace DocFileFormat
 		friend class OpenXmlPackage;
 		friend class TextboxMapping;
 		friend class SettingsMapping;
-
+		friend class WordprocessingDocument;
 	public:
 
-		WordDocument (const ProgressCallback* pCallFunc, const std::wstring & tempFolder, const int userLCID);
+		WordDocument (const std::wstring & tempFolder, const int userLCID);
 		virtual ~WordDocument();
 
 		_UINT32 LoadDocument(const std::wstring & fileName, const std::wstring & password);
@@ -154,9 +153,9 @@ namespace DocFileFormat
 		std::wstring			m_sTempFolder;
 		std::wstring			m_sTempDecryptFileName;
 		int						m_nUserLCID;
+		std::wstring			m_sXmlApp;
+		std::wstring			m_sXmlCore;
 
-		const ProgressCallback* m_pCallFunc;
-	
 		POLE::Stream			* WordDocumentStream;	// The stream "WordDocument"		
 		POLE::Stream			* TableStream;			// The stream "0Table" or "1Table"	
 		POLE::Stream			* DataStream;			// The stream called "Data"

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

@@ -49,9 +49,10 @@ namespace DocFileFormat
 
 	WordprocessingDocument::~WordprocessingDocument()
 	{
+		_isSectionPageBreak = 0;
 	}
 
-	void WordprocessingDocument::SaveDocument(bool &bMacros)
+	_UINT32 WordprocessingDocument::SaveDocument(bool &bMacros)
 	{
 		std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + L"word" ;
 		NSDirectory::CreateDirectory( pathWord );
@@ -71,7 +72,6 @@ namespace DocFileFormat
 
 				RegisterDocumentMacros();
 				RegisterVbaProject();	
-				//output_document->get_xl_files().add_vba_project();
 			}
 			else bMacros = false;
 		}
@@ -83,54 +83,66 @@ namespace DocFileFormat
 			RegisterDocument();
 		}
 		OOX::CContentTypes oContentTypes;
-		OOX::CPath pathDocProps = m_strOutputPath + FILE_SEPARATOR_STR + _T("docProps");
+		OOX::CPath pathDocProps = m_strOutputPath + FILE_SEPARATOR_STR + L"docProps";
 		NSDirectory::CreateDirectory(pathDocProps.GetPath());
 		
-		OOX::CPath DocProps = std::wstring(_T("docProps"));
+		OOX::CPath DocProps = std::wstring(L"docProps");
 
-		OOX::CApp* pApp = new OOX::CApp(NULL);
-		if (pApp)
+		if (docFile->m_sXmlApp.empty())
 		{
-			std::wstring sApplication = NSSystemUtils::GetEnvVariable(NSSystemUtils::gc_EnvApplicationName);
-			if (sApplication.empty())
-				sApplication = NSSystemUtils::gc_EnvApplicationNameDefault;
-			pApp->SetApplication(sApplication);
-	#if defined(INTVER)
-			pApp->SetAppVersion(VALUE2STR(INTVER));
-	#endif
-			pApp->SetDocSecurity(0);
-			pApp->SetScaleCrop(false);
-			pApp->SetLinksUpToDate(false);
-			pApp->SetSharedDoc(false);
-			pApp->SetHyperlinksChanged(false);
-			
-			pApp->write(pathDocProps + FILE_SEPARATOR_STR + _T("app.xml"), DocProps, oContentTypes);
-			delete pApp;
-		}				
-		OOX::CCore* pCore = new OOX::CCore(NULL);
-		if (pCore)
+			OOX::CApp* pApp = new OOX::CApp(NULL);
+			if (pApp)
+			{
+				std::wstring sApplication = NSSystemUtils::GetEnvVariable(NSSystemUtils::gc_EnvApplicationName);
+				if (sApplication.empty())
+					sApplication = NSSystemUtils::gc_EnvApplicationNameDefault;
+
+#if defined(INTVER)
+				std::string s = VALUE2STR(INTVER);
+				sApplication += L"/" + std::wstring(s.begin(), s.end());
+#endif
+				pApp->m_sApplication = sApplication;
+				pApp->SetDefaults();
+
+				pApp->write(pathDocProps + FILE_SEPARATOR_STR + L"app.xml", DocProps, oContentTypes);
+				delete pApp;
+			}
+		}
+		else
 		{
-			pCore->SetCreator(_T(""));
-			pCore->SetLastModifiedBy(_T(""));
-			pCore->write(pathDocProps + FILE_SEPARATOR_STR + _T("core.xml"), DocProps, oContentTypes);
-			delete pCore;
-		} 
+			SaveToFile(pathDocProps.GetPath(), L"app.xml", docFile->m_sXmlApp);
+		}
+		if (docFile->m_sXmlCore.empty())
+		{
+			OOX::CCore* pCore = new OOX::CCore(NULL);
+			if (pCore)
+			{
+				pCore->SetCreator(L"");
+				pCore->SetLastModifiedBy(L"");
+				pCore->write(pathDocProps + FILE_SEPARATOR_STR + L"core.xml", DocProps, oContentTypes);
+				delete pCore;
+			}
+		}
+		else
+		{
+			SaveToFile(pathDocProps.GetPath(), L"core.xml", docFile->m_sXmlCore);
+		}
 		RegisterDocPr();
 
 		WritePackage();
 
 		//Write main content. (word directory)
 
-        SaveToFile(pathWord, std::wstring( L"document.xml" ),		DocumentXML );
-        SaveToFile(pathWord, std::wstring( L"fontTable.xml" ),      FontTableXML );
-        SaveToFile(pathWord, std::wstring( L"styles.xml" ),         StyleSheetXML );
-        SaveToFile(pathWord, std::wstring( L"footnotes.xml" ),      FootnotesXML );
-        SaveToFile(pathWord, std::wstring( L"endnotes.xml" ),		EndnotesXML );
-        SaveToFile(pathWord, std::wstring( L"numbering.xml" ),      NumberingXML );
-        SaveToFile(pathWord, std::wstring( L"comments.xml" ),		CommentsXML );
-		SaveToFile(pathWord, std::wstring( L"commentsExtended.xml"),CommentsExtendedXML );
-        SaveToFile(pathWord, std::wstring( L"settings.xml" ),		SettingsXML );
-        SaveToFile(pathWord, std::wstring( L"customizations.xml" ), CommandTableXML );
+        SaveToFile(pathWord, L"document.xml",			DocumentXML );
+        SaveToFile(pathWord, L"fontTable.xml",			FontTableXML );
+        SaveToFile(pathWord, L"styles.xml",				StyleSheetXML );
+        SaveToFile(pathWord, L"footnotes.xml",			FootnotesXML );
+        SaveToFile(pathWord, L"endnotes.xml",			EndnotesXML );
+        SaveToFile(pathWord, L"numbering.xml",			NumberingXML );
+        SaveToFile(pathWord, L"comments.xml",			CommentsXML );
+		SaveToFile(pathWord, L"commentsExtended.xml",	CommentsExtendedXML );
+        SaveToFile(pathWord, L"settings.xml",			SettingsXML );
+        SaveToFile(pathWord, L"customizations.xml",		CommandTableXML );
 
 		if (!ImagesList.empty())
 		{
@@ -172,12 +184,13 @@ namespace DocFileFormat
 
 		for (std::list<std::wstring>::iterator iter = HeaderXMLList.begin(); iter != HeaderXMLList.end(); ++iter)
 		{
-            SaveToFile(pathWord, ( std::wstring( L"header" ) + FormatUtils::IntToWideString(++headersCount) + std::wstring( L".xml" ) ), *iter);
+            SaveToFile(pathWord, ( L"header" + FormatUtils::IntToWideString(++headersCount) + L".xml"), *iter);
 		}
 
 		for (std::list<std::wstring>::iterator iter = FooterXMLList.begin(); iter != FooterXMLList.end(); ++iter)
 		{
-            SaveToFile(pathWord, ( std::wstring( L"footer" ) + FormatUtils::IntToWideString(++footersCount) + std::wstring( L".xml" ) ), *iter);
+            SaveToFile(pathWord, ( L"footer" + FormatUtils::IntToWideString(++footersCount) + L".xml" ), *iter);
 		}
+		return 0;
 	}
 }

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.h

@@ -76,9 +76,11 @@ namespace DocFileFormat
 		std::list<std::wstring> FooterXMLList;
 
 	public:
+		int _isSectionPageBreak; //0 - not set, 1 -page break, 2 - continues, -1 - already
+
 		WordprocessingDocument(const std::wstring & _docxDirectory, const WordDocument* _docFile);
 		virtual ~WordprocessingDocument();
 		
-		void SaveDocument(bool &bMacros);
+		_UINT32 SaveDocument(bool &bMacros);
 	};
 }

ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp

@@ -34,7 +34,7 @@
 #include "../DocDocxConverter/Converter.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
-_UINT32 COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack)
+_UINT32 COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, bool &bMacros)
 {
 	_UINT32 hr = 0;
 
@@ -43,12 +43,12 @@ _UINT32 COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::w
 	docToDocx.m_sTempFolder = m_sTempFolder;
 	docToDocx.m_nUserLCID = m_nUserLCID;
 
-    hr= docToDocx.LoadAndConvert(docFile, docxDirectory, password, ffCallBack, bMacros);
+    hr= docToDocx.LoadAndConvert(docFile, docxDirectory, password, bMacros);
 
 	return hr;
 }
 
-_UINT32 COfficeDocFile::SaveToFile (const std::wstring &  sDstFileName, const std::wstring &   sSrcFileName, ProgressCallback *ffCallBack )
+_UINT32 COfficeDocFile::SaveToFile (const std::wstring &  sDstFileName, const std::wstring &   sSrcFileName)
 {
     return 0;
 }

ASCOfficeDocFile/DocFormatLib/DocFormatLib.h

@@ -29,8 +29,7 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#ifndef DOC_FORMAT_LIB
-#define DOC_FORMAT_LIB
+#pragma once 
 
 #if defined(_WIN32) || defined(_WIN64)
 	#include <windows.h>
@@ -38,8 +37,6 @@
 
 #include "../../DesktopEditor/common/ASCVariant.h"
 
-struct ProgressCallback;
-
 class COfficeDocFile 
 {
 public:
@@ -49,9 +46,8 @@ public:
 	std::wstring	m_sTempFolder;
 	int				m_nUserLCID;
 
-    _UINT32 LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstFileName, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack = NULL);
-    _UINT32 SaveToFile(const std::wstring &  sDstFileName, const std::wstring &  sSrcFileName, ProgressCallback *ffCallBack = NULL);
+    _UINT32 LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstFileName, const std::wstring & password, bool &bMacros);
+    _UINT32 SaveToFile(const std::wstring &  sDstFileName, const std::wstring &  sSrcFileName);
 
 };
 
-#endif //DOC_FORMAT_LIB

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31624.102
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatLib", "DocFormatLib.vcxproj", "{C5371405-338F-4B70-83BD-2A5CDF64F383}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x64.ActiveCfg = Debug|x64
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x64.Build.0 = Debug|x64
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x86.ActiveCfg = Debug|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x86.Build.0 = Debug|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x64.ActiveCfg = Release|x64
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x64.Build.0 = Release|x64
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x86.ActiveCfg = Release|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3EDBED06-16E0-41A4-B58C-20C41B41BE20}
+	EndGlobalSection
+EndGlobal

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcxproj

@@ -68,12 +68,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
-    <IncludePath>D:\_Work\core\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\_Work\core\Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
+    <LibraryPath>..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <IncludePath>..\..\..\Common\3dParty\boost\build\win_64\include;$(IncludePath)</IncludePath>
+    <LibraryPath>..\..\..\Common\3dParty\boost\build\win_64\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
@@ -86,7 +88,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\DesktopEditor\freetype-2.5.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -103,7 +105,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

ASCOfficeDocxFile2/BinReader/CustomXmlWriter.cpp

@@ -45,7 +45,7 @@ namespace Writers
 		m_nCount++;
 
 		std::wstring sCustomXmlDir = m_sDir + FILE_SEPARATOR_STR;
-		sCustomXmlDir += OOX::FileTypes::CustomXmlProps.DefaultDirectory().GetPath();
+		sCustomXmlDir += OOX::FileTypes::CustomXml.DefaultDirectory().GetPath();
 		
 		std::wstring sCustomXmlRelsDir = sCustomXmlDir + FILE_SEPARATOR_STR + L"_rels";
 		
@@ -54,7 +54,7 @@ namespace Writers
 
 		NSFile::CFileBinary::SaveToFile(sCustomXmlDir + FILE_SEPARATOR_STR + sCustomXMLPropsFilename, sCustomXmlPropertiesContent);
 		OOX::CContentTypes& oContentTypes = *m_pDrawingConverter->GetContentTypes();
-		oContentTypes.Registration( OOX::FileTypes::CustomXmlProps.OverrideType(), OOX::FileTypes::CustomXmlProps.DefaultDirectory(), sCustomXMLPropsFilename );
+		oContentTypes.Registration( OOX::FileTypes::CustomXmlProps.OverrideType(), OOX::FileTypes::CustomXml.DefaultDirectory(), sCustomXMLPropsFilename );
 
 		std::wstring sCustomXmlFilename;
 		sCustomXmlFilename = OOX::FileTypes::CustomXml.DefaultFileName().GetBasename() + std::to_wstring(m_nCount);
@@ -81,7 +81,7 @@ namespace Writers
 		oCustomXMLProps.m_oShemaRefs->m_arrItems.push_back(pShemaRef);
 
 		std::wstring sCustomXmlPropsDir = m_sDir + FILE_SEPARATOR_STR;
-		sCustomXmlPropsDir += OOX::FileTypes::CustomXmlProps.DefaultDirectory().GetPath();
+		sCustomXmlPropsDir += OOX::FileTypes::CustomXml.DefaultDirectory().GetPath();
 		NSDirectory::CreateDirectories(sCustomXmlPropsDir);
 		std::wstring  sCustomXMLPropsFilename = OOX::FileTypes::CustomXmlProps.DefaultFileName().GetBasename();
 		sCustomXMLPropsFilename += std::to_wstring(m_nCount) + OOX::FileTypes::CustomXmlProps.DefaultFileName().GetExtention();

ASCOfficeDocxFile2/BinReader/FileWriter.cpp

@@ -53,7 +53,8 @@ FileWriter::FileWriter(std::wstring sDirOutput,std::wstring sFontDir, bool bNoFo
 	m_pComments			(NULL),
 	m_pApp				(NULL),
 	m_pCore				(NULL),
-	m_pCustomProperties	(NULL)
+	m_pCustomProperties	(NULL),
+	m_pCurrentSettings	(NULL)
 {
 }
 FileWriter::~FileWriter()
@@ -61,6 +62,8 @@ FileWriter::~FileWriter()
     RELEASEOBJECT(m_pApp);
     RELEASEOBJECT(m_pCore);
 	RELEASEOBJECT(m_pCustomProperties);
+
+	m_pCurrentSettings = NULL;
 }
 void FileWriter::Write()
 {

ASCOfficeDocxFile2/BinReader/FileWriter.h

@@ -61,6 +61,7 @@ namespace OOX
 {
 	class CApp;
 	class CCore;
+	class CSettings;
 }
 namespace PPTX
 {
@@ -80,7 +81,7 @@ namespace Writers
 			numbering(sDirOutput),
 			footnotes(sDirOutput),
 			endnotes(sDirOutput),
-			settings(sDirOutput, headers_footers),
+			settings(sDirOutput),
 			comments(sDirOutput),
 			web_settings(sDirOutput)
 		{}
@@ -167,6 +168,7 @@ namespace Writers
 		BinDocxRW::CComments*			m_pComments;
 		OOX::CApp*						m_pApp;
 		OOX::CCore*						m_pCore;
+		OOX::CSettings*					m_pCurrentSettings;
 		PPTX::CustomProperties*			m_pCustomProperties;
 
 		bool m_bGlossaryMode = false;

ASCOfficeDocxFile2/BinReader/ReaderClasses.cpp

@@ -0,0 +1,162 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * 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 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * 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
+ *
+ */
+#include "ReaderClasses.h"
+
+namespace BinDocxRW {
+	TrackRevision::TrackRevision()
+	{
+		Id = NULL;
+		vMerge = NULL;
+		vMergeOrigin = NULL;
+		RPr = NULL;
+		PPr = NULL;
+		sectPr = NULL;
+		tblPr = NULL;
+		tblGridChange = NULL;
+		trPr = NULL;
+		tcPr = NULL;
+		content = NULL;
+		contentRun = NULL;
+	}
+	TrackRevision::~TrackRevision()
+	{
+		RELEASEOBJECT(Id);
+		RELEASEOBJECT(vMerge);
+		RELEASEOBJECT(vMergeOrigin);
+		RELEASEOBJECT(RPr);
+		RELEASEOBJECT(PPr);
+		RELEASEOBJECT(sectPr);
+		RELEASEOBJECT(tblPr);
+		RELEASEOBJECT(tblGridChange);
+		RELEASEOBJECT(trPr);
+		RELEASEOBJECT(tcPr);
+		RELEASEOBJECT(content);
+		RELEASEOBJECT(contentRun);
+	}
+	void TrackRevision::Write(NSStringUtils::CStringBuilder*  pCStringWriter, std::wstring sName)
+	{
+		if (IsNoEmpty())
+		{
+			pCStringWriter->WriteString(L"<");
+			pCStringWriter->WriteString(sName);
+			if (NULL != Id)
+			{
+				pCStringWriter->WriteString(L" w:id=\"" + std::to_wstring(*Id) + L"\"");
+			}
+			if (!Author.empty())
+			{
+				pCStringWriter->WriteString(L" w:author=\"");
+				pCStringWriter->WriteEncodeXmlString(Author);
+				pCStringWriter->WriteString(L"\"");
+			}
+			if (!Date.empty())
+			{
+				pCStringWriter->WriteString(L" w:date=\"");
+				pCStringWriter->WriteEncodeXmlString(Date);
+				pCStringWriter->WriteString(L"\"");
+			}
+			if (!UserId.empty())
+			{
+				pCStringWriter->WriteString(L" oouserid=\"");
+				pCStringWriter->WriteEncodeXmlString(UserId);
+				pCStringWriter->WriteString(L"\"");
+			}
+			if (NULL != vMerge)
+			{
+				pCStringWriter->WriteString(L" w:vMerge=\"" + std::to_wstring(*vMerge) + L"\"");
+			}
+			if (NULL != vMergeOrigin)
+			{
+				pCStringWriter->WriteString(L" w:vMergeOrig=\"" + std::to_wstring(*vMergeOrigin) + L"\"");
+			}
+			if (NULL != RPr || NULL != PPr || NULL != sectPr || NULL != tblPr || NULL != tblGridChange || NULL != trPr || NULL != tcPr || NULL != content || NULL != contentRun)
+			{
+				pCStringWriter->WriteString(L">");
+				if (NULL != RPr)
+				{
+					pCStringWriter->WriteString(RPr->toXML());
+				}
+				if (NULL != PPr)
+				{
+					pCStringWriter->WriteString(L"<w:pPr>");
+					pCStringWriter->Write(*PPr);
+					pCStringWriter->WriteString(L"</w:pPr>");
+				}
+				if (NULL != sectPr)
+				{
+					pCStringWriter->WriteString(L"<w:sectPr>");
+					pCStringWriter->WriteString(sectPr->Write());
+					pCStringWriter->WriteString(L"</w:sectPr>");
+				}
+				if (NULL != tblPr)
+				{
+					pCStringWriter->WriteString(tblPr->Write());
+				}
+				if (NULL != tblGridChange)
+				{
+					pCStringWriter->WriteString(L"<w:tblGrid>");
+					pCStringWriter->Write(*tblGridChange);
+					pCStringWriter->WriteString(L"</w:tblGrid>");
+				}
+				if (NULL != trPr)
+				{
+					pCStringWriter->WriteString(L"<w:trPr>");
+					pCStringWriter->Write(*trPr);
+					pCStringWriter->WriteString(L"</w:trPr>");
+				}
+				if (NULL != tcPr)
+				{
+					pCStringWriter->WriteString(L"<w:tcPr>");
+					pCStringWriter->Write(*tcPr);
+					pCStringWriter->WriteString(L"</w:tcPr>");
+				}
+				if (NULL != content)
+				{
+					pCStringWriter->Write(*content);
+				}
+				if (NULL != contentRun)
+				{
+					pCStringWriter->Write(*contentRun);
+				}
+
+				pCStringWriter->WriteString(L"</");
+				pCStringWriter->WriteString(sName);
+				pCStringWriter->WriteString(L">");
+			}
+			else
+			{
+				pCStringWriter->WriteString(L"/>");
+			}
+		}
+	}
+
+}

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -34,9 +34,11 @@
 #include "HeaderFooterWriter.h"
 
 #include "../../Common/DocxFormat/Source/XML/Utils.h"
-#include "../../Common/DocxFormat/Source/Common/SimpleTypes_Word.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.h"
+#include "../BinWriter/BinReaderWriterDefines.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/unordered_map.hpp>
 
 namespace BinDocxRW {
 
@@ -382,107 +384,6 @@ public:
     }
 };
 
-class Shd
-{
-public:
-    BYTE        Value;
-    docRGB      Color;
-	docRGB      Fill;
-	CThemeColor ThemeColor;
-	CThemeColor ThemeFill;
-
-	bool bValue = false;
-	bool bColor = false;
-	bool bThemeColor = false;
-	bool bThemeFill = false;
-	bool bFill = false;
-	
-	Shd(){}
-
-    std::wstring ToString()
-	{
-        std::wstring sShd;
-		if(bValue || bColor || (bThemeColor && ThemeColor.IsNoEmpty()) || (bThemeFill && ThemeFill.IsNoEmpty()))
-		{
-			sShd += L"<w:shd";
-			if(bValue)
-			{
-				switch(Value)
-				{
-					case SimpleTypes::shdClear                 : sShd += L" w:val=\"clear\"";		break;
-					case SimpleTypes::shdDiagCross             : sShd += L" w:val=\"diagCross\"";	break;
-					case SimpleTypes::shdDiagStripe            : sShd += L" w:val=\"diagStripe\"";	break;
-					case SimpleTypes::shdHorzCross             : sShd += L" w:val=\"horzCross\"";	break;
-					case SimpleTypes::shdHorzStripe            : sShd += L" w:val=\"horzStripe\"";	break;
-					case SimpleTypes::shdNil                   : sShd += L" w:val=\"nil\"";			break;
-					case SimpleTypes::shdPct10                 : sShd += L" w:val=\"pct10\"";	break;
-					case SimpleTypes::shdPct12                 : sShd += L" w:val=\"pct12\"";	break;
-					case SimpleTypes::shdPct15                 : sShd += L" w:val=\"pct15\"";	break;
-					case SimpleTypes::shdPct20                 : sShd += L" w:val=\"pct20\"";	break;
-					case SimpleTypes::shdPct25                 : sShd += L" w:val=\"pct25\"";	break;
-					case SimpleTypes::shdPct30                 : sShd += L" w:val=\"pct30\"";	break;
-					case SimpleTypes::shdPct35                 : sShd += L" w:val=\"pct35\"";	break;
-					case SimpleTypes::shdPct37                 : sShd += L" w:val=\"pct37\"";	break;
-					case SimpleTypes::shdPct40                 : sShd += L" w:val=\"pct40\"";	break;
-					case SimpleTypes::shdPct45                 : sShd += L" w:val=\"pct45\"";	break;
-					case SimpleTypes::shdPct5                  : sShd += L" w:val=\"pct5\"";	break;
-					case SimpleTypes::shdPct50                 : sShd += L" w:val=\"pct50\"";	break;
-					case SimpleTypes::shdPct55                 : sShd += L" w:val=\"pct55\"";	break;
-					case SimpleTypes::shdPct60                 : sShd += L" w:val=\"pct60\"";	break;
-					case SimpleTypes::shdPct62                 : sShd += L" w:val=\"pct62\"";	break;
-					case SimpleTypes::shdPct65                 : sShd += L" w:val=\"pct65\"";	break;
-					case SimpleTypes::shdPct70                 : sShd += L" w:val=\"pct70\"";	break;
-					case SimpleTypes::shdPct75                 : sShd += L" w:val=\"pct75\"";	break;
-					case SimpleTypes::shdPct80                 : sShd += L" w:val=\"pct80\"";	break;
-					case SimpleTypes::shdPct85                 : sShd += L" w:val=\"pct85\"";	break;
-					case SimpleTypes::shdPct87                 : sShd += L" w:val=\"pct87\"";	break;
-					case SimpleTypes::shdPct90                 : sShd += L" w:val=\"pct90\"";	break;
-					case SimpleTypes::shdPct95                 : sShd += L" w:val=\"pct95\"";	break;
-					case SimpleTypes::shdReverseDiagStripe     : sShd += L" w:val=\"reverseDiagStripe\"";		break;
-					case SimpleTypes::shdSolid                 : sShd += L" w:val=\"solid\"";					break;
-					case SimpleTypes::shdThinDiagCross         : sShd += L" w:val=\"thinDiagCross\"";			break;
-					case SimpleTypes::shdThinDiagStripe        : sShd += L" w:val=\"thinDiagStripe\"";			break;
-					case SimpleTypes::shdThinHorzCross         : sShd += L" w:val=\"thinHorzCross\"";			break;
-					case SimpleTypes::shdThinHorzStripe			: sShd += L" w:val=\"thinHorzStripe\"";			break;
-					case SimpleTypes::shdThinReverseDiagStripe	: sShd += L" w:val=\"thinReverseDiagStripe\"";	break;
-					case SimpleTypes::shdThinVertStripe			: sShd += L" w:val=\"thinVertStripe\"";			break;
-					case SimpleTypes::shdVertStripe				: sShd += L" w:val=\"vertStripe\"";				break;
-					default										: sShd += L" w:val=\"solid\"";					break;
-				}
-			}
-			if (bColor)
-				sShd += L" w:color=\"" + Color.ToString() + L"\"";
-
-			if (bFill)
-				sShd += L" w:fill=\"" + Fill.ToString() + L"\"";
-			
-			if(bThemeColor && ThemeColor.IsNoEmpty())
-			{
-				if(ThemeColor.Auto && !bFill)
-                    sShd += L" w:fill=\"auto\"";
-				if(ThemeColor.bColor)
-                    sShd += L" w:themeFill=\"" + ThemeColor.ToStringColor() + L"\"";
-                if(ThemeColor.bTint)
-                    sShd += L" w:themeFillTint=\"" + ThemeColor.ToStringTint() + L"\"";
-				if(ThemeColor.bShade)
-                    sShd += L" w:themeFillShade=\"" + ThemeColor.ToStringShade() + L"\"";
-			}
-			if(bThemeFill && ThemeFill.IsNoEmpty())
-			{
-				if(ThemeFill.Auto && !bColor)
-					sShd += L" w:color=\"auto\"";
-				if(ThemeFill.bColor)
-					sShd += L" w:themeColor=\"" + ThemeFill.ToStringColor() + L"\"";
-				if(ThemeFill.bTint)
-					sShd += L" w:themeTint=\"" + ThemeFill.ToStringTint() + L"\"";
-				if(ThemeFill.bShade)
-					sShd += L" w:themeShade=\"" + ThemeFill.ToStringShade() + L"\"";
-			}
-            sShd += L"/>";
-		}
-		return sShd;
-	}
-};
 class Tab
 {
 public:
@@ -501,424 +402,7 @@ class Tabs
 public:
 	std::vector<Tab> m_aTabs;
 };
-class rPr
-{
-private:
-    boost::unordered_map<std::wstring, int>& m_mapFonts;
-public:
-	bool Bold;
-	bool Italic;
-	bool Underline;
-	bool Strikeout;
-    std::wstring FontAscii;
-    std::wstring FontHAnsi;
-    std::wstring FontAE;
-    std::wstring FontCS;
-	std::wstring FontAsciiTheme;
-	std::wstring FontHAnsiTheme;
-	std::wstring FontAETheme;
-	std::wstring FontCSTheme;
-	long FontSize;
-	docRGB Color;
-	BYTE VertAlign;
-	docRGB HighLight;
-	BYTE nHighLight;
-	std::wstring Shd;
-    std::wstring RStyle;
-	long Spacing;
-	bool DStrikeout;
-	bool Caps;
-	bool SmallCaps;
-	long Position;
-	BYTE FontHint;
-	bool BoldCs;
-	bool ItalicCs;
-	long FontSizeCs;
-	bool Cs;
-	bool Rtl;
-    std::wstring Lang;
-    std::wstring LangBidi;
-    std::wstring LangEA;
-	CThemeColor ThemeColor;
-	bool Vanish;
-    std::wstring Outline;
-    std::wstring Fill;
-    std::wstring Del;
-    std::wstring Ins;
-	std::wstring MoveFrom;
-	std::wstring MoveTo;
-    std::wstring rPrChange;
 
-	bool bBold;
-	bool bItalic;
-	bool bUnderline;
-	bool bStrikeout;
-	bool bFontAscii;
-	bool bFontHAnsi;
-	bool bFontAE;
-	bool bFontCS;
-	bool bFontSize;
-	bool bColor;
-	bool bVertAlign;
-	bool bShd;
-	bool bRStyle;
-	bool bSpacing;
-	bool bDStrikeout;
-	bool bCaps;
-	bool bSmallCaps;
-	bool bPosition;
-	bool bFontHint;
-	bool bBoldCs;
-	bool bItalicCs;
-	bool bFontSizeCs;
-	bool bCs;
-	bool bRtl;
-	bool bLang;
-	bool bLangBidi;
-	bool bLangEA;
-	bool bThemeColor;
-	bool bVanish;
-
-	bool bDoNotWriteNullProp;
-public:
-    rPr(boost::unordered_map<std::wstring, int>& mapFonts) : m_mapFonts(mapFonts)
-	{
-		Reset();
-
-		bDoNotWriteNullProp = false;
-	}
-	void Reset()
-	{
-		Bold = false;
-		Italic = false;
-		Underline = false;
-		Strikeout = false;
-		DStrikeout = false;
-		Caps = false;
-		SmallCaps = false;
-
-		bBold = false;
-		bItalic = false;
-		bUnderline = false;
-		bStrikeout = false;
-		bFontAscii = false;
-		bFontHAnsi = false;
-		bFontAE = false;
-		bFontCS = false;
-		bFontSize = false;
-		bColor = false;
-		bVertAlign = false;
-		bShd = false;
-		bRStyle = false;
-		bSpacing = false;
-		bDStrikeout = false;
-		bCaps = false;
-		bSmallCaps = false;
-		bPosition = false;
-		bFontHint = false;
-		bBoldCs = false;
-		bItalicCs = false;
-		bFontSizeCs = false;
-		bCs = false;
-		bRtl = false;
-		bLang = false;
-		bLangBidi = false;
-		bLangEA = false;
-		bThemeColor = false;
-		ThemeColor.Reset();
-		bVanish = false;
-
-		nHighLight = 0; //not set
-		Outline.clear();
-        Fill.clear();
-        Del.clear();
-        Ins.clear();
-		MoveFrom.clear();
-		MoveTo.clear();
-        rPrChange.clear();
-	}
-	bool IsNoEmpty()
-	{
-		return bBold || bItalic || bUnderline || bStrikeout || bFontAscii || bFontHAnsi || bFontAE || bFontCS || bFontSize || bColor || bVertAlign || nHighLight > 0 || bShd ||
-			bRStyle || bSpacing || bDStrikeout || bCaps || bSmallCaps || bPosition || bFontHint || bBoldCs || bItalicCs || bFontSizeCs || bCs || bRtl || bLang || bLangBidi || bLangEA || bThemeColor || bVanish ||
-			!Outline.empty() || !Fill.empty() || !Del.empty() || !Ins.empty() || !MoveFrom.empty() || !MoveTo.empty() || !rPrChange.empty() || !FontAsciiTheme.empty() || !FontHAnsiTheme.empty() || !FontAETheme.empty() || !FontCSTheme.empty();
-	}
-	void Write(NSStringUtils::CStringBuilder*  pCStringWriter)
-	{
-        pCStringWriter->WriteString(L"<w:rPr>");
-		if(bRStyle)
-		{
-            pCStringWriter->WriteString(L"<w:rStyle w:val=\"" + RStyle + L"\"/>");
-		}
-		if(bFontAscii || bFontHAnsi || bFontAE || bFontCS || bFontHint || !FontAsciiTheme.empty() || !FontHAnsiTheme.empty() || !FontAETheme.empty() || !FontCSTheme.empty())
-		{
-            std::wstring sFont = _T("<w:rFonts");
-			if(bFontAscii)
-			{
-                sFont += L" w:ascii=\"" + FontAscii + L"\"";
-				m_mapFonts[FontAscii] = 1;
-			}
-			if(bFontHAnsi)
-			{
-                sFont += L" w:hAnsi=\"" + FontHAnsi + L"\"";
-				m_mapFonts[FontHAnsi] = 1;
-			}
-			if(bFontCS)
-			{
-                sFont += L" w:cs=\"" + FontCS + L"\"";
-				m_mapFonts[FontCS] = 1;
-			}
-			if(bFontAE)
-			{
-                sFont += L" w:eastAsia=\"" + FontAE + L"\"";
-				m_mapFonts[FontAE] = 1;
-			}
-			if(!FontAsciiTheme.empty())
-			{
-				sFont += L" w:asciiTheme=\"" + FontAsciiTheme + L"\"";
-			}
-			if(!FontHAnsiTheme.empty())
-			{
-				sFont += L" w:hAnsiTheme=\"" + FontHAnsiTheme + L"\"";
-			}
-			if(!FontAETheme.empty())
-			{
-				sFont += L" w:eastAsiaTheme=\"" + FontAETheme + L"\"";
-			}
-			if(!FontCSTheme.empty())
-			{
-				sFont += L" w:cstheme=\"" + FontCSTheme + L"\"";
-			}
-			if(bFontHint)
-			{
-				switch(FontHint)
-				{
-                case 0: sFont += L" w:hint=\"cs\"";         break;
-                case 2: sFont += L" w:hint=\"eastAsia\"";   break;
-                default:sFont += L" w:hint=\"default\"";    break;
-				}
-			}
-			sFont += _T("/>");
-			pCStringWriter->WriteString(sFont);
-		}
-		if(bBold)
-		{
-			if(Bold)
-                pCStringWriter->WriteString(L"<w:b/>");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:b w:val=\"false\"/>");
-		}
-		if(bBoldCs)
-		{
-			if(BoldCs)
-                pCStringWriter->WriteString(L"<w:bCs/>");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:bCs w:val=\"false\"/>");
-		}
-		if(bItalic)
-		{
-			if(Italic)
-                pCStringWriter->WriteString(L"<w:i/>");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:i w:val=\"false\"/>");
-		}
-		if(bItalicCs)
-		{
-			if(ItalicCs)
-                pCStringWriter->WriteString(L"<w:iCs />");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:iCs w:val=\"false\"/>");
-		}
-		if(bCaps)
-		{
-			if(Caps)
-                pCStringWriter->WriteString(L"<w:caps/>");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:caps w:val=\"false\"/>");
-		}
-		if(bSmallCaps)
-		{
-			if(SmallCaps)
-                pCStringWriter->WriteString(L"<w:smallCaps/>");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:smallCaps w:val=\"false\"/>");
-		}
-		if(bStrikeout)
-		{
-			if(Strikeout)
-                pCStringWriter->WriteString(L"<w:strike/>");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:strike w:val=\"false\"/>");
-		}
-		if(bDStrikeout)
-		{
-			if(DStrikeout)
-                pCStringWriter->WriteString(L"<w:dstrike/>");
-			//else if(false == bDoNotWriteNullProp)
-   //             pCStringWriter->WriteString(L"<w:dstrike w:val=\"false\"/>");
-		}
-		if(bVanish)
-		{
-			if(Vanish)
-                pCStringWriter->WriteString(L"<w:vanish/>");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:vanish w:val=\"false\"/>");
-		}
-		if(bColor || (bThemeColor && ThemeColor.IsNoEmpty()))
-		{
-            std::wstring sColor(L"<w:color");
-			if(bColor)
-                sColor += L" w:val=\"" + Color.ToString() + L"\"";
-			if(bThemeColor && ThemeColor.IsNoEmpty())
-			{
-				if(ThemeColor.Auto && !bColor)
-                    sColor += L" w:val=\"auto\"";
-				if(ThemeColor.bColor)
-                    sColor += L" w:themeColor=\"" + ThemeColor.ToStringColor() + L"\"";
-				if(ThemeColor.bTint)
-                    sColor += L" w:themeTint=\"" + ThemeColor.ToStringTint() + L"\"";
-				if(ThemeColor.bShade)
-                    sColor += L" w:themeShade=\"" + ThemeColor.ToStringShade() + L"\"";
-			}
-            sColor += L"/>";
-			pCStringWriter->WriteString(sColor);
-		}
-		if(bSpacing)
-		{
-			pCStringWriter->WriteString(L"<w:spacing w:val=\"" + std::to_wstring(Spacing) + L"\"/>");
-		}
-		if(bPosition)
-		{
-			std::wstring sPosition = L"<w:position w:val=\"" + std::to_wstring(Position) + L"\"/>";
-			pCStringWriter->WriteString(sPosition);
-		}
-		if(bFontSize)
-		{
-            pCStringWriter->WriteString(L"<w:sz w:val=\"" + std::to_wstring(FontSize) + L"\"/>");
-		}
-		if(bFontSizeCs)
-		{
-			if(false == bFontSize)
-				pCStringWriter->WriteString(L"<w:sz w:val=\"" + std::to_wstring(FontSizeCs) + L"\"/>");
-			pCStringWriter->WriteString(L"<w:szCs w:val=\"" + std::to_wstring(FontSizeCs) + L"\"/>");
-		}
-		if(nHighLight > 0)
-		{
-			docRGB& H = HighLight;
-            std::wstring sColor;
-			if (nHighLight == 1)
-				sColor = L"none";
-			else if(0x00 == H.R && 0x00 == H.G && 0x00 == H.B )
-				sColor = _T("black");
-			else if(0x00 == H.R && 0x00 == H.G && 0xFF == H.B )
-				sColor = _T("blue");
-			else if(0x00 == H.R && 0xFF == H.G && 0xFF == H.B )
-				sColor = _T("cyan");
-			else if(0x00 == H.R && 0x00 == H.G && 0x8B == H.B )
-				sColor = _T("darkBlue");
-			else if(0x00 == H.R && 0x8B == H.G && 0x8B == H.B )
-				sColor = _T("darkCyan");
-			else if(0xA9 == H.R && 0xA9 == H.G && 0xA9 == H.B )
-				sColor = _T("darkGray");
-			else if(0x00 == H.R && 0x64 == H.G && 0x00 == H.B )
-				sColor = _T("darkGreen");
-			else if(0x80 == H.R && 0x00 == H.G && 0x80 == H.B )
-				sColor = _T("darkMagenta");
-			else if(0x8B == H.R && 0x00 == H.G && 0x00 == H.B )
-				sColor = _T("darkRed");
-			else if(0x80 == H.R && 0x80 == H.G && 0x00 == H.B )
-				sColor = _T("darkYellow");
-			else if(0x00 == H.R && 0xFF == H.G && 0x00 == H.B )
-				sColor = _T("green");
-			else if(0xD3 == H.R && 0xD3 == H.G && 0xD3 == H.B )
-				sColor = _T("lightGray");
-			else if(0xFF == H.R && 0x00 == H.G && 0xFF == H.B )
-				sColor = _T("magenta");
-			else if(0xFF == H.R && 0x00 == H.G && 0x00 == H.B )
-				sColor = _T("red");
-			else if(0xFF == H.R && 0xFF == H.G && 0xFF == H.B )
-				sColor = _T("white");
-			else if(0xFF == H.R && 0xFF == H.G && 0x00 == H.B )
-				sColor = _T("yellow");
-            if(!sColor.empty())
-			{
-                pCStringWriter->WriteString(L"<w:highlight w:val=\"" + sColor + L"\"/>");
-			}
-			else if(g_nCurFormatVersion < 5)
-			{
-				//добавляем как shading
-                pCStringWriter->WriteString(L"<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"" + H.ToString() + L"\"/>");
-			}
-		}
-		if(bUnderline)
-		{
-			if(Underline)
-                pCStringWriter->WriteString(L"<w:u w:val=\"single\"/>");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:u w:val=\"none\"/>");
-		}
-		if(bShd)
-			pCStringWriter->WriteString(Shd);
-		if(bVertAlign)
-		{
-			switch(VertAlign)
-			{
-			case vertalign_Baseline:
-				if(false == bDoNotWriteNullProp)
-                    pCStringWriter->WriteString(L"<w:vertAlign w:val=\"baseline\"/>" );
-				break;
-            case vertalign_SuperScript:pCStringWriter->WriteString(L"<w:vertAlign w:val=\"superscript\"/>" );break;
-            case vertalign_SubScript:pCStringWriter->WriteString(L"<w:vertAlign w:val=\"subscript\"/>" );break;
-			}
-		}
-		if(bRtl)
-		{
-			if(Rtl)
-                pCStringWriter->WriteString(L"<w:rtl/>");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:rtl w:val=\"false\"/>");
-		}
-		if(bCs)
-		{
-			if(Cs)
-                pCStringWriter->WriteString(L"<w:cs/>");
-			else if(false == bDoNotWriteNullProp)
-                pCStringWriter->WriteString(L"<w:cs w:val=\"false\"/>");
-		}
-		if(bLang || bLangBidi || bLangEA)
-		{
-            pCStringWriter->WriteString(L"<w:lang");
-			if(bLang)
-			{
-                pCStringWriter->WriteString(L" w:val=\"" + Lang + L"\"");
-			}
-			if(bLangBidi)
-			{
-                pCStringWriter->WriteString(L" w:bidi=\"" + LangBidi + L"\"");
-			}
-			if(bLangEA)
-			{
-                pCStringWriter->WriteString(L" w:eastAsia=\"" + LangEA + L"\"");
-			}
-            pCStringWriter->WriteString(L"/>");
-		}
-        if (!Outline.empty())
-			pCStringWriter->WriteString(Outline);
-        if (!Fill.empty())
-			pCStringWriter->WriteString(Fill);
-        if (!Del.empty())
-			pCStringWriter->WriteString(Del);
-        if (!Ins.empty())
-			pCStringWriter->WriteString(Ins);
-		if (!MoveFrom.empty())
-			pCStringWriter->WriteString(MoveFrom);
-		if (!MoveTo.empty())
-			pCStringWriter->WriteString(MoveTo);
-        if (!rPrChange.empty())
-			pCStringWriter->WriteString(rPrChange);
-        pCStringWriter->WriteString(L"</w:rPr>");
-	}
-};
 class docStyle
 {
 public:
@@ -984,10 +468,10 @@ public:
         std::wstring sType;
 		switch(byteType)
 		{
-		case styletype_Character: sType = _T("character");break;
-		case styletype_Numbering: sType = _T("numbering");break;
-		case styletype_Table: sType = _T("table");break;
-		default: sType = _T("paragraph");break;
+			case styletype_Character: sType = _T("character");break;
+			case styletype_Numbering: sType = _T("numbering");break;
+			case styletype_Table: sType = _T("table");break;
+			default: sType = _T("paragraph");break;
 		}
         if(!Id.empty())
 		{
@@ -1009,12 +493,31 @@ public:
 
             sStyle += L">";
             pCStringWriter->WriteString(sStyle);
-			if(!Aliases.empty())
+
+            if(!Name.empty())
+			{
+                pCStringWriter->WriteString(L"<w:name w:val=\"" + Name + L"\"/>");
+			}		
+			if (!Aliases.empty())
 			{
 				pCStringWriter->WriteString(L"<w:aliases w:val=\"");
 				pCStringWriter->WriteEncodeXmlString(Aliases);
 				pCStringWriter->WriteString(L"\"/>");
 			}
+			if (!BasedOn.empty())
+			{
+				pCStringWriter->WriteString(L"<w:basedOn w:val=\"" + BasedOn + L"\"/>");
+			}
+			if (!NextId.empty())
+			{
+				pCStringWriter->WriteString(L"<w:next w:val=\"" + NextId + L"\"/>");
+			}
+			if (!Link.empty())
+			{
+				pCStringWriter->WriteString(L"<w:link w:val=\"");
+				pCStringWriter->WriteEncodeXmlString(Link);
+				pCStringWriter->WriteString(L"\"/>");
+			}
 			if(bautoRedefine)
 			{
 				if(autoRedefine)
@@ -1022,17 +525,44 @@ public:
 				else
 					pCStringWriter->WriteString(L"<w:autoRedefine val=\"false\"/>");
 			}
-            if(!Name.empty())
+			if (bhidden)
 			{
-                pCStringWriter->WriteString(L"<w:name w:val=\"" + Name + L"\"/>");
+				if (hidden)
+					pCStringWriter->WriteString(L"<w:hidden/>");
+				else
+					pCStringWriter->WriteString(L"<w:hidden val=\"false\"/>");
 			}
-            if(!BasedOn.empty())
+			if (buiPriority)
 			{
-                pCStringWriter->WriteString(L"<w:basedOn w:val=\"" + BasedOn + L"\"/>");
+				pCStringWriter->WriteString(L"<w:uiPriority w:val=\"" + std::to_wstring(uiPriority) + L"\"/>");
 			}
-            if(!NextId.empty())
+			if (bsemiHidden)
 			{
-                pCStringWriter->WriteString(L"<w:next w:val=\"" + NextId + L"\"/>");
+				if (semiHidden)
+					pCStringWriter->WriteString(L"<w:semiHidden/>");
+				else
+					pCStringWriter->WriteString(L"<w:semiHidden val=\"false\"/>");
+			}
+			if (bunhideWhenUsed)
+			{
+				if (unhideWhenUsed)
+					pCStringWriter->WriteString(L"<w:unhideWhenUsed/>");
+				else
+					pCStringWriter->WriteString(L"<w:unhideWhenUsed val=\"false\"/>");
+			}
+			if (bqFormat)
+			{
+				if (qFormat)
+					pCStringWriter->WriteString(L"<w:qFormat/>");
+				else
+					pCStringWriter->WriteString(L"<w:qFormat val=\"false\"/>");
+			}
+			if (blocked)
+			{
+				if (locked)
+					pCStringWriter->WriteString(L"<w:locked/>");
+				else
+					pCStringWriter->WriteString(L"<w:locked val=\"false\"/>");
 			}
 			if(bpersonal)
 			{
@@ -1055,61 +585,17 @@ public:
 				else
 					pCStringWriter->WriteString(L"<w:personalReply val=\"false\"/>");
 			}
-			if(!Link.empty())
-			{
-				pCStringWriter->WriteString(L"<w:link w:val=\"");
-				pCStringWriter->WriteEncodeXmlString(Link);
-				pCStringWriter->WriteString(L"\"/>");
-			}
-			if(blocked)
-			{
-				if(locked)
-					pCStringWriter->WriteString(L"<w:locked/>");
-				else
-					pCStringWriter->WriteString(L"<w:locked val=\"false\"/>");
-			}
-			if(bqFormat)
-			{
-				if(qFormat)
-                    pCStringWriter->WriteString(L"<w:qFormat/>");
-				else
-                    pCStringWriter->WriteString(L"<w:qFormat val=\"false\"/>");
-			}
-			if(buiPriority)
-			{
-                pCStringWriter->WriteString(L"<w:uiPriority w:val=\"" + std::to_wstring(uiPriority) + L"\"/>");
-			}
-			if(bhidden)
-			{
-				if(hidden)
-                    pCStringWriter->WriteString(L"<w:hidden/>");
-				else
-                    pCStringWriter->WriteString(L"<w:hidden val=\"false\"/>");
-			}
-			if(bsemiHidden)
-			{
-				if(semiHidden)
-                    pCStringWriter->WriteString(L"<w:semiHidden/>");
-				else
-                    pCStringWriter->WriteString(L"<w:semiHidden val=\"false\"/>");
-			}
-			if(bunhideWhenUsed)
-			{
-				if(unhideWhenUsed)
-                    pCStringWriter->WriteString(L"<w:unhideWhenUsed/>");
-				else
-                    pCStringWriter->WriteString(L"<w:unhideWhenUsed val=\"false\"/>");
-			}
-            if(!TextPr.empty())
-			{
-				pCStringWriter->WriteString(TextPr);
-			}
             if(!ParaPr.empty())
 			{
                 pCStringWriter->WriteString(L"<w:pPr>");
 				pCStringWriter->WriteString(ParaPr);
                 pCStringWriter->WriteString(L"</w:pPr>");
 			}
+            if(!TextPr.empty())
+			{
+				pCStringWriter->WriteString(TextPr);
+			}
+
             if(!TablePr.empty())
 				pCStringWriter->WriteString(TablePr);
             if(!RowPr.empty())
@@ -1364,14 +850,6 @@ public:
 			{
                 pCStringWriter->WriteString(L" w:color=\"" + Color.ToString() + L"\"");
 			}
-			if(bSize)
-			{
-				pCStringWriter->WriteString(L" w:sz=\"" + std::to_wstring(Size) + L"\"");
-			}
-			if(bSpace)
-			{
-				pCStringWriter->WriteString(L" w:space=\"" + std::to_wstring(Space) + L"\"");
-			}
 			if(bThemeColor && ThemeColor.IsNoEmpty())
 			{
 				if(ThemeColor.Auto && !bColor)
@@ -1392,6 +870,14 @@ public:
                     pCStringWriter->WriteString(L" w:themeShade=\"" + ThemeColor.ToStringShade() + L"\"");
 				}
 			}
+			if(bSize)
+			{
+				pCStringWriter->WriteString(L" w:sz=\"" + std::to_wstring(Size) + L"\"");
+			}
+			if(bSpace)
+			{
+				pCStringWriter->WriteString(L" w:space=\"" + std::to_wstring(Space) + L"\"");
+			}
             pCStringWriter->WriteString(L"/>");
 		}
 		else
@@ -1441,18 +927,18 @@ public:
 	}
 	void Write(NSStringUtils::CStringBuilder*  pCStringWriter, bool bCell)
 	{
-		if(bLeft)
-            oLeft.Write(L"w:left", pCStringWriter, bCell);
 		if(bTop)
             oTop.Write(L"w:top", pCStringWriter, bCell);
-		if(bRight)
-            oRight.Write(L"w:right", pCStringWriter, bCell);
+		if(bLeft)
+            oLeft.Write(L"w:left", pCStringWriter, bCell);
 		if(bBottom)
             oBottom.Write(L"w:bottom", pCStringWriter, bCell);
-		if(bInsideV)
-            oInsideV.Write(L"w:insideV", pCStringWriter, bCell);
+		if(bRight)
+            oRight.Write(L"w:right", pCStringWriter, bCell);
 		if(bInsideH)
             oInsideH.Write(L"w:insideH", pCStringWriter, bCell);
+		if(bInsideV)
+            oInsideV.Write(L"w:insideV", pCStringWriter, bCell);
 		if(bBetween)
             oBetween.Write(L"w:between", pCStringWriter, bCell);
 	}
@@ -2490,7 +1976,8 @@ public:
 				}
 				else
 				{
-					sXml += L"<wp:inline xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
+					sXml += L"<wp:inline \
+xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
 distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"" + std::to_wstring(Width) + L"\" cy=\"" + std::to_wstring(Height) + L"\"/>";
 				}
 
@@ -2562,15 +2049,19 @@ distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"" + std::to_wstr
 				{
 					sXml += L"<w:drawing>";
 				}
-                sXml += L"<wp:anchor xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\"\
-                             distT=\""      + std::to_wstring(emuDistT) +
-                        L"\" distB=\""      + std::to_wstring(emuDistB) +
-                        L"\" distL=\""      + std::to_wstring(emuDistL) +
-                        L"\" distR=\""      + std::to_wstring(emuDistR) +
-                        L"\" simplePos=\""  + std::to_wstring(nSimplePos) +
-                        L"\" relativeHeight=\"" + std::to_wstring(nRelativeHeight) +
-                        L"\" behindDoc=\""  + std::to_wstring(nBehindDoc) +
-                        L"\" locked=\"0\" layoutInCell=\"" + std::to_wstring(nLayoutInCell) + L"\" allowOverlap=\"1\">";
+                sXml += L"<wp:anchor \
+xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
+xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" \
+distT=\"" + std::to_wstring(emuDistT) + L"\" \
+distB=\"" + std::to_wstring(emuDistB) + L"\" \
+distL=\"" + std::to_wstring(emuDistL) + L"\" \
+distR=\"" + std::to_wstring(emuDistR) + L"\" \
+simplePos=\"" + std::to_wstring(nSimplePos) + L"\" \
+relativeHeight=\"" + std::to_wstring(nRelativeHeight) + L"\" \
+behindDoc=\"" + std::to_wstring(nBehindDoc) + L"\" \
+locked=\"0\" \
+layoutInCell=\"" + std::to_wstring(nLayoutInCell) + L"\" \
+allowOverlap=\"1\">";
 
                 __int64 emuX = 0;
                 if(bSimplePosX)
@@ -2779,6 +2270,7 @@ public:
     std::wstring TableCellSpacing;
 	std::wstring Caption;
 	std::wstring Description;
+	std::wstring Overlap;
 	bool IsEmpty()
 	{
         return Jc.empty() && TableInd.empty() && TableW.empty() && TableCellMar.empty() && TableBorders.empty() && Shd.empty() && tblpPr.empty()&& Style.empty() && Look.empty() && tblPrChange.empty() && TableCellSpacing.empty() && RowBandSize.empty() && ColBandSize.empty();
@@ -2795,7 +2287,9 @@ public:
             sRes += (RowBandSize);
         if(!ColBandSize.empty())
             sRes += (ColBandSize);
-        if(false == TableW.empty())
+		if (!Overlap.empty())
+			sRes += (Overlap);
+		if(false == TableW.empty())
             sRes += (TableW);
         if(false == Jc.empty())
             sRes += (Jc);
@@ -3101,6 +2595,7 @@ public:
 		}
 	}
 };
+
 class TrackRevision
 {
 public:
@@ -3111,7 +2606,8 @@ public:
 	long* vMerge;
 	long* vMergeOrigin;
 
-	rPr* RPr;
+	OOX::Logic::CRunProperty* RPr;
+
 	NSStringUtils::CStringBuilder* PPr;
 	SectPr* sectPr;
 	CWiterTblPr* tblPr;
@@ -3120,36 +2616,8 @@ public:
 	NSStringUtils::CStringBuilder* tcPr;
 	NSStringUtils::CStringBuilder* content;
 	NSStringUtils::CStringBuilder* contentRun;
-	TrackRevision()
-	{
-		Id = NULL;
-		vMerge = NULL;
-		vMergeOrigin = NULL;
-		RPr = NULL;
-		PPr = NULL;
-		sectPr = NULL;
-		tblPr = NULL;
-        tblGridChange = NULL;
-		trPr = NULL;
-		tcPr = NULL;
-		content = NULL;
-		contentRun = NULL;
-	}
-	~TrackRevision()
-	{
-		RELEASEOBJECT(Id);
-		RELEASEOBJECT(vMerge);
-		RELEASEOBJECT(vMergeOrigin);
-		RELEASEOBJECT(RPr);
-		RELEASEOBJECT(PPr);
-		RELEASEOBJECT(sectPr);
-		RELEASEOBJECT(tblPr);
-        RELEASEOBJECT(tblGridChange);
-		RELEASEOBJECT(trPr);
-		RELEASEOBJECT(tcPr);
-		RELEASEOBJECT(content);
-		RELEASEOBJECT(contentRun);
-	}
+	TrackRevision();
+	~TrackRevision();
 	bool IsNoEmpty()
 	{
         return !Author.empty() || !Date.empty() || NULL != Id;
@@ -3160,101 +2628,6 @@ public:
 		Write(&writer, sName);
 		return writer.GetData();
 	}
-	void Write(NSStringUtils::CStringBuilder*  pCStringWriter, std::wstring sName)
-	{
-		if(IsNoEmpty())
-		{
-            pCStringWriter->WriteString(L"<");
-			pCStringWriter->WriteString(sName);
-            if(NULL != Id)
-            {
-                pCStringWriter->WriteString(L" w:id=\"" + std::to_wstring(*Id) + L"\"");
-            }
-            if(!Author.empty())
-			{
-                pCStringWriter->WriteString(L" w:author=\"");
-				pCStringWriter->WriteEncodeXmlString(Author);
-                pCStringWriter->WriteString(L"\"");
-			}
-            if(!Date.empty())
-			{
-                pCStringWriter->WriteString(L" w:date=\"");
-				pCStringWriter->WriteEncodeXmlString(Date);
-                pCStringWriter->WriteString(L"\"");
-			}
-            if(!UserId.empty())
-            {
-                pCStringWriter->WriteString(L" oouserid=\"");
-                pCStringWriter->WriteEncodeXmlString(UserId);
-                pCStringWriter->WriteString(L"\"");
-            }
-			if(NULL != vMerge)
-			{
-                pCStringWriter->WriteString(L" w:vMerge=\"" + std::to_wstring(*vMerge) + L"\"");
-			}
-			if(NULL != vMergeOrigin)
-			{
-                pCStringWriter->WriteString(L" w:vMergeOrig=\"" + std::to_wstring(*vMergeOrigin) + L"\"");
-			}
-			if(NULL != RPr || NULL != PPr || NULL != sectPr || NULL != tblPr || NULL != tblGridChange || NULL != trPr || NULL != tcPr || NULL != content|| NULL != contentRun)
-			{
-                pCStringWriter->WriteString(L">");
-				if(NULL != RPr)
-				{
-					RPr->Write(pCStringWriter);
-				}
-				if(NULL != PPr)
-				{
-                    pCStringWriter->WriteString(L"<w:pPr>");
-					pCStringWriter->Write(*PPr);
-                    pCStringWriter->WriteString(L"</w:pPr>");
-				}
-				if(NULL != sectPr)
-				{
-                    pCStringWriter->WriteString(L"<w:sectPr>");
-					pCStringWriter->WriteString(sectPr->Write());
-                    pCStringWriter->WriteString(L"</w:sectPr>");
-				}
-				if(NULL != tblPr)
-				{
-					pCStringWriter->WriteString(tblPr->Write());
-				}
-                if(NULL != tblGridChange)
-                {
-                    pCStringWriter->WriteString(L"<w:tblGrid>");
-                    pCStringWriter->Write(*tblGridChange);
-                    pCStringWriter->WriteString(L"</w:tblGrid>");
-                }
-				if(NULL != trPr)
-				{
-                    pCStringWriter->WriteString(L"<w:trPr>");
-					pCStringWriter->Write(*trPr);
-                    pCStringWriter->WriteString(L"</w:trPr>");
-				}
-				if(NULL != tcPr)
-				{
-                    pCStringWriter->WriteString(L"<w:tcPr>");
-					pCStringWriter->Write(*tcPr);
-                    pCStringWriter->WriteString(L"</w:tcPr>");
-				}
-				if(NULL != content)
-				{
-					pCStringWriter->Write(*content);
-				}
-				if(NULL != contentRun)
-				{
-					pCStringWriter->Write(*contentRun);
-				}
-
-                pCStringWriter->WriteString(L"</");
-				pCStringWriter->WriteString(sName);
-                pCStringWriter->WriteString(L" >");
-			}
-			else
-			{
-                pCStringWriter->WriteString(L" />");
-			}
-		}
-	}
+	void Write(NSStringUtils::CStringBuilder*  pCStringWriter, std::wstring sName);
 };
 }

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -38,8 +38,8 @@
 
 namespace OOX
 {
-	class CComments;
 	class CSettingsCustom;
+	class CSettings;
 }
 namespace BinDocxRW {
 
@@ -56,25 +56,26 @@ class Binary_CommonReader2 : public Binary_CommonReader
 public:
 	Binary_CommonReader2(NSBinPptxRW::CBinaryFileReader& poBufferedStream);
 	docRGB ReadColor();
-	void ReadColor2(SimpleTypes::CHexColor<>& color);
+	void ReadHexColor(SimpleTypes::CHexColor<> *pColor);
 	void ReadThemeColor(int length, CThemeColor& oCThemeColor);
-	int _ReadThemeColor(BYTE type, long length, void* poResult);
+	int ReadThemeColorContent(BYTE type, long length, void* poResult);
 	template<typename T> int ReadTrackRevision(long length, T* poResult);
-	int ReadShd(BYTE type, long length, void* poResult);
+	template<typename T> int ReadTrackRevision2(long length, T* poResult);
+	int ReadShdComplexType(BYTE type, long length, void* poResult);
 private:
 	template<typename T> int ReadTrackRevisionInner(BYTE type, long length, T* poResult);
+	template<typename T> int ReadTrackRevisionInner2(BYTE type, long length, T* poResult);
 };
 class Binary_HdrFtrTableReader : public Binary_CommonReader
 {
 	Writers::FileWriter&	m_oFileWriter;
-	CComments*				m_pComments;
 
 	int						nCurType;
 	int						nCurHeaderType;
 public:
 	Writers::HeaderFooterWriter& m_oHeaderFooterWriter;
 	
-	Binary_HdrFtrTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, CComments* pComments);
+	Binary_HdrFtrTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter);
     int Read();
     int ReadHdrFtrContent	(BYTE type, long length, void* poResult);
     int ReadHdrFtrFEO		(BYTE type, long length, void* poResult);
@@ -86,11 +87,12 @@ class Binary_rPrReader : public Binary_CommonReader
 protected:
 	Binary_CommonReader2 oBinary_CommonReader2;
 	Writers::FileWriter& m_oFileWriter;
+	boost::unordered_map<std::wstring, char>& m_mapFonts;
 public:
 	Binary_rPrReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter);
 	int Read(long stLen, void* poResult);
 	int ReadContent(BYTE type, long length, void* poResult);
-	int ReadrPrChange(BYTE type, long length, void* poResult);
+	int ReadrPrChange2(BYTE type, long length, void* poResult);
 };
 class Binary_pPrReader : public Binary_CommonReader
 {
@@ -241,10 +243,13 @@ class Binary_SettingsTableReader : public Binary_CommonReader
 	Binary_rPrReader m_oBinary_rPrReader;
 	Writers::SettingWriter& m_oSettingWriter;
 	Writers::FileWriter& m_oFileWriter;
-	OOX::CSettingsCustom& m_oSettingsCustom;
+	
+	OOX::CSettingsCustom* m_pSettingsCustom;
 public:
-	Binary_SettingsTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, OOX::CSettingsCustom& oSettingsCustom);
+	Binary_SettingsTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, OOX::CSettingsCustom* pSettingsCustom);
 	int Read();
+	int ReadDocProtect(BYTE type, long length, void* poResult);
+	int ReadWriteProtect(BYTE type, long length, void* poResult);
 	int ReadSettings(BYTE type, long length, void* poResult);
 	int ReadCompat(BYTE type, long length, void* poResult);
 	int ReadCompatSetting(BYTE type, long length, void* poResult);
@@ -281,18 +286,17 @@ private:
     Binary_rPrReader                oBinary_rPrReader;
     Binary_tblPrReader              oBinary_tblPrReader;
 	NSStringUtils::CStringBuilder*	m_pCurWriter;
-    rPr                             m_oCur_rPr;
-    rPr                             m_oMath_rPr;
+    OOX::Logic::CRunProperty		m_oCur_rPr;
+	OOX::Logic::CRunProperty		m_oMath_rPr;
 	NSStringUtils::CStringBuilder	m_oCur_pPr;
     BYTE                            m_byteLastElemType;
 public:
-    CComments*                      m_pComments;
     Writers::ContentWriter&         m_oDocumentWriter;
     Writers::MediaWriter&           m_oMediaWriter;
 
 	bool							m_bUsedParaIdCounter;
 
-    Binary_DocumentTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, Writers::ContentWriter& oDocumentWriter, CComments* pComments);
+    Binary_DocumentTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, Writers::ContentWriter& oDocumentWriter);
 	~Binary_DocumentTableReader();
 	
 	int Read();
@@ -480,12 +484,11 @@ public:
 class Binary_NotesTableReader : public Binary_CommonReader
 {
 	Writers::FileWriter&					m_oFileWriter;
-	CComments*								m_pComments;
 	bool									m_bIsFootnote;
 	nullable<SimpleTypes::CDecimalNumber<>>	m_oId;
 	nullable<SimpleTypes::CFtnEdn<>>		m_oType;
 public:
-	Binary_NotesTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, CComments* pComments, bool bIsFootnote);
+	Binary_NotesTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, bool bIsFootnote);
 	int Read();
 	int ReadNotes(BYTE type, long length, void* poResult);
 	int ReadNote(BYTE type, long length, void* poResult);

ASCOfficeDocxFile2/BinReader/SettingWriter.h

@@ -36,55 +36,28 @@
 namespace Writers
 {
     static std::wstring g_string_set_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?><w:settings xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:v=\"urn:schemas-microsoft-com:vml\">");
-	static std::wstring g_string_set_Default = _T("<w:zoom w:percent=\"100\"/><w:characterSpacingControl w:val=\"doNotCompress\"/><w:themeFontLang w:val=\"en-US\" w:eastAsia=\"zh-CN\"/><w:shapeDefaults><o:shapedefaults v:ext=\"edit\" spidmax=\"1026\"/><o:shapelayout v:ext=\"edit\"><o:idmap v:ext=\"edit\" data=\"1\"/></o:shapelayout></w:shapeDefaults>");
     static std::wstring g_string_set_End = _T("</w:settings>");
 
 	class SettingWriter
 	{
         std::wstring					m_sDir;
 		NSStringUtils::CStringBuilder	m_oSettingWriter;
-		HeaderFooterWriter&				m_oHeaderFooterWriter;
 	public:
-        SettingWriter(std::wstring sDir, HeaderFooterWriter& oHeaderFooterWriter):m_sDir(sDir),m_oHeaderFooterWriter(oHeaderFooterWriter)
+        SettingWriter(std::wstring sDir) : m_sDir(sDir)
 		{
 		}
 		void Write(bool bGlossary = false)
 		{
-			Prepare();
             OOX::CPath filePath = m_sDir + FILE_SEPARATOR_STR + L"word" + (bGlossary ? (FILE_SEPARATOR_STR + std::wstring(L"glossary")) : L"") + FILE_SEPARATOR_STR + L"settings.xml";
 
 			NSFile::CFileBinary oFile;
 			oFile.CreateFileW(filePath.GetPath());
-			oFile.WriteStringUTF8(g_string_set_Start);
 			oFile.WriteStringUTF8(m_oSettingWriter.GetData());
-			oFile.WriteStringUTF8(g_string_set_Default);
-			oFile.WriteStringUTF8(g_string_set_End);
 			oFile.CloseFile();
 		}
         void AddSetting(std::wstring sSetting)
 		{
 			m_oSettingWriter.WriteString(sSetting);
 		}
-		void Prepare()
-		{
-			if(BinDocxRW::g_nCurFormatVersion < 5)
-			{
-				bool bevenAndOddHeaders = false;
-				for(size_t i = 0, length = m_oHeaderFooterWriter.m_aHeaders.size(); i < length; ++i)
-				{
-					HdrFtrItem* pHeader = m_oHeaderFooterWriter.m_aHeaders[i];
-					if(SimpleTypes::hdrftrEven == pHeader->eType)
-						bevenAndOddHeaders = true;
-				}
-				for(size_t i = 0, length = m_oHeaderFooterWriter.m_aFooters.size(); i < length; ++i)
-				{
-					HdrFtrItem* pFooter = m_oHeaderFooterWriter.m_aFooters[i];
-					if(SimpleTypes::hdrftrEven == pFooter->eType)
-						bevenAndOddHeaders = true;
-				}
-				if(bevenAndOddHeaders)
-					AddSetting(L"<w:evenAndOddHeaders/>");
-			}
-		}
 	};
 }

ASCOfficeDocxFile2/BinReader/fontTableWriter.h

@@ -43,11 +43,11 @@ namespace Writers
 	class FontTableWriter
 	{
 		NSStringUtils::CStringBuilder	m_oWriter;
-        std::wstring            m_sDir;
-        NSFonts::IApplicationFonts* m_pApplicationFonts;
-        NSFonts::IFontManager*      m_pFontManager;
+        std::wstring					m_sDir;
+        NSFonts::IApplicationFonts*		m_pApplicationFonts;
+        NSFonts::IFontManager*			m_pFontManager;
 	public:
-        boost::unordered_map<std::wstring, int> m_mapFonts;
+        boost::unordered_map<std::wstring, char> m_mapFonts;
 
 		FontTableWriter(std::wstring sDir, std::wstring sFontDir, bool bNoFontDir) : m_sDir(sDir)
 		{
@@ -72,11 +72,11 @@ namespace Writers
 		{
 			m_oWriter.WriteString(g_string_ft_Start);
 
-			//Те шрифты которые всегда пишем в FontTable
+	//Те шрифты которые всегда пишем в FontTable
 			bool bCalibri = false;
 			bool bTimes = false;
 			bool bCambria = false;
-            for (boost::unordered_map<std::wstring, int>::const_iterator it = m_mapFonts.begin(); it != m_mapFonts.end(); ++it)
+            for (boost::unordered_map<std::wstring, char>::const_iterator it = m_mapFonts.begin(); it != m_mapFonts.end(); ++it)
 			{
                 const std::wstring& sFontName = it->first;
 				if(_T("Calibri") == sFontName)

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -47,10 +47,6 @@ const int heightrule_AtLeast = 0x00;
 const int heightrule_Auto    = 0x01;
 const int heightrule_Exact   = 0x02;
 
-const int vertalign_Baseline    = 0;
-const int vertalign_SuperScript = 1;
-const int vertalign_SubScript   = 2;
-
 const int align_Right   = 0;
 const int align_Left    = 1;
 const int align_Center  = 2;
@@ -304,7 +300,8 @@ extern int g_nCurFormatVersion;
 		tblCaption = 17,
 		tblDescription = 18,
 		TableIndTwips = 19,
-		TableCellSpacingTwips = 20
+		TableCellSpacingTwips = 20,
+		tblOverlap = 21
 	};}
 	namespace c_oSer_tblpPrType{enum c_oSer_tblpPrType
 	{
@@ -416,7 +413,19 @@ extern int g_nCurFormatVersion;
 		FontAsciiTheme = 40,
 		FontHAnsiTheme = 41,
 		FontAETheme = 42,
-		FontCSTheme = 43
+		FontCSTheme = 43,
+		CompressText = 44,
+		SnapToGrid = 45,
+		Ligatures = 46,
+		NumSpacing = 47,
+		NumForm = 48,
+		StylisticSets = 49,
+		CntxtAlts = 50,
+		ShadowExt = 51,
+		Reflection = 52,
+		Glow = 53,
+		Props3d = 54,
+		Scene3d = 55
 	};}
 	namespace c_oSerProp_rowPrType{enum c_oSerProp_rowPrType
 	{
@@ -596,7 +605,10 @@ extern int g_nCurFormatVersion;
 		arPr = 28,
 		fldChar = 29,
 		instrText = 30,
-		delInstrText = 31
+		delInstrText = 31,
+		linebreakClearAll = 32,
+		linebreakClearLeft = 33,
+		linebreakClearRight = 34
 	};}
 	namespace c_oSerVbaProjectTypes{enum c_oSerVbaProjectType
 	{
@@ -864,7 +876,10 @@ extern int g_nCurFormatVersion;
 		BookFoldPrinting = 15,
 		BookFoldPrintingSheets = 16,
 		BookFoldRevPrinting = 17,
-		SpecialFormsHighlight = 18
+		SpecialFormsHighlight = 18,
+		DocumentProtection = 19,
+		WriteProtection = 20
+
 	};}
 	namespace c_oSer_MathPrType{enum c_oSer_SettingsType
 	{
@@ -1153,7 +1168,8 @@ extern int g_nCurFormatVersion;
 		Custom = 0,
 		ItemId = 1,
 		Uri = 2,
-		Content = 3
+		Content = 3,
+		ContentA = 4
 	};}
 	namespace c_oSerApp{enum c_oSerApp
 	{
@@ -1243,7 +1259,8 @@ extern int g_nCurFormatVersion;
 		PictureFormPrShiftX = 64,
 		PictureFormPrShiftY = 65,
 		FormPrBorder = 70,
-		FormPrShd = 71
+		FormPrShd = 71,
+		TextFormPrCombWRule = 72
 	};}
 	namespace c_oSerFFData{enum c_oSerFFData
 	{
@@ -1302,4 +1319,46 @@ extern int g_nCurFormatVersion;
 		Flags2 = 5,
 		Flags3 = 6
 	};}
+	namespace c_oDocProtect {
+		enum c_oDocProtect
+		{
+			AlgorithmName = 0,
+			Edit = 1,
+			Enforcment = 2,
+			Formatting = 3,
+			HashValue = 4,
+			SaltValue = 5,
+			SpinCount = 6,
+			
+			AlgIdExt = 7,
+			AlgIdExtSource = 8,
+			CryptAlgorithmClass = 9,
+			CryptAlgorithmSid = 10,
+			CryptAlgorithmType = 11,
+			CryptProvider = 12,
+			CryptProviderType = 13,
+			CryptProviderTypeExt = 14,
+			CryptProviderTypeExtSource = 15
+		};
+	}
+	namespace c_oWriteProtect {
+		enum c_oWriteProtect
+		{
+			AlgorithmName = 0,
+			Recommended = 1,
+			HashValue = 2,
+			SaltValue = 3,
+			SpinCount = 4,
+			
+			AlgIdExt = 7,
+			AlgIdExtSource = 8,
+			CryptAlgorithmClass = 9,
+			CryptAlgorithmSid = 10,
+			CryptAlgorithmType = 11,
+			CryptProvider = 12,
+			CryptProviderType = 13,
+			CryptProviderTypeExt = 14,
+			CryptProviderTypeExtSource = 15
+		};
+	}
 }

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -48,6 +48,8 @@
 #include "../../Common/DocxFormat/Source/DocxFormat/HeaderFooter.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/App.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/Core.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Footnote.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Endnote.h"
 
 namespace NSBinPptxRW
 {
@@ -548,6 +550,8 @@ namespace BinDocxRW
 		void WriteColorSchemeMapping(const PPTX::Logic::ClrMap& oColorSchemeMapping);
 		void WriteCompat(const OOX::Settings::CCompat& oCompat);
 		void WriteCompatSetting(const OOX::Settings::CCompatSetting& oCompatSetting);
+		void WriteDocumentProtection(const OOX::Settings::CDocProtect& oDocProtect);
+		void WriteWriteProtection(const OOX::Settings::CWriteProtection& oWriteProtection);
 	};
 	class BinaryNotesTableWriter
 	{

ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp

@@ -516,8 +516,7 @@ namespace BinXlsxRW{
 		{
 			pWorksheet = new OOX::Spreadsheet::CWorksheet(NULL);
 			pWorksheet->m_oSheetFormatPr.Init();
-			pWorksheet->m_oSheetFormatPr->m_oDefaultRowHeight.Init();
-			pWorksheet->m_oSheetFormatPr->m_oDefaultRowHeight->SetValue(15);
+			pWorksheet->m_oSheetFormatPr->m_oDefaultRowHeight = 15.;
 			pWorksheet->m_oPageMargins.Init();
 			pWorksheet->m_oPageMargins.Init();
 			pWorksheet->m_oPageMargins->m_oLeft.Init();
@@ -579,40 +578,51 @@ namespace BinXlsxRW{
 				//SharedStrings
 				if(pCell->m_oValue.IsInit())
 				{
-					pCell->m_oType.Init();
-					const std::wstring& val = pCell->m_oValue->m_sText;
-					if(L"TRUE" == val || L"FALSE" == val)
+					if (pCell->m_oType.IsInit())
 					{
-						pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeBool);
-						if(L"TRUE" == val)
+						if (pCell->m_oType->GetValue() == SimpleTypes::Spreadsheet::celltypeSharedString)
 						{
-							pCell->m_oValue->m_sText = L"1";
+							aSharedStrings.push_back(pCell->m_oValue->m_sText);
+							pCell->m_oValue->m_sText = std::to_wstring(aSharedStrings.size() - 1);
 						}
-						else
-						{
-							pCell->m_oValue->m_sText = L"0";
-						}
-					}
-					else if(L"#NULL!" == val || L"#DIV/0!" == val || L"#VALUE!" == val || L"#REF!" == val || L"#NAME?" == val || L"#NUM!" == val || L"#N/A" == val)
-					{
-						pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeError);
-						pCell->m_oValue->m_sText = val;
 					}
 					else
 					{
-						//как в CsvReader - подозрительный код
-						WCHAR *pEndPtr;
-						wcstod(val.c_str(), &pEndPtr);
-						if (0 != *pEndPtr)
+						pCell->m_oType.Init();
+						const std::wstring& val = pCell->m_oValue->m_sText;
+						if(L"TRUE" == val || L"FALSE" == val)
 						{
-							// Не число
-							aSharedStrings.push_back(val);
-							pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeSharedString);
-							pCell->m_oValue->m_sText = std::to_wstring((int)aSharedStrings.size() - 1);
+							pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeBool);
+							if(L"TRUE" == val)
+							{
+								pCell->m_oValue->m_sText = L"1";
+							}
+							else
+							{
+								pCell->m_oValue->m_sText = L"0";
+							}
+						}
+						else if(L"#NULL!" == val || L"#DIV/0!" == val || L"#VALUE!" == val || L"#REF!" == val || L"#NAME?" == val || L"#NUM!" == val || L"#N/A" == val)
+						{
+							pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeError);
+							pCell->m_oValue->m_sText = val;
 						}
 						else
 						{
-							pCell->m_oValue->m_sText = val;
+							//как в CsvReader - подозрительный код
+							WCHAR *pEndPtr;
+							wcstod(val.c_str(), &pEndPtr);
+							if (0 != *pEndPtr)
+							{
+								// Не число
+								aSharedStrings.push_back(val);
+								pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeSharedString);
+								pCell->m_oValue->m_sText = std::to_wstring((int)aSharedStrings.size() - 1);
+							}
+							else
+							{
+								pCell->m_oValue->m_sText = val;
+							}
 						}
 					}
 				}
@@ -621,7 +631,7 @@ namespace BinXlsxRW{
 			pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
 		}
 	}
-	void ChartWriter::parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format = NULL)
+	void ChartWriter::parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format = NULL, bool bAlwaysSharedString)
 	{
         std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::const_iterator itSheets = m_mapSheets.find(sheet);
         std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = NULL;
@@ -650,6 +660,12 @@ namespace BinXlsxRW{
 		if(cells->find(nCol) == cells->end())
 		{
 			OOX::Spreadsheet::CCell* pNewCell = parseCreateCell(nRow, nCol, val, format);
+
+			if (bAlwaysSharedString)
+			{
+				pNewCell->m_oType.Init();
+				pNewCell->m_oType->SetValue(SimpleTypes::Spreadsheet::ECellTypeType::celltypeSharedString);
+			}
 			cells->insert(std::make_pair(nCol, pNewCell));
 		}
 	}
@@ -708,14 +724,14 @@ namespace BinXlsxRW{
 						{
 							if(nCol1 > 1)
 							{
-								parseCell(sheetFrom, nRow1, nCol1 - 1, std::wstring(cRangeName), NULL);
+								parseCell(sheetFrom, nRow1, nCol1 - 1, std::wstring(cRangeName), NULL, true);
 							}
 						}
 						else
 						{
 							if(nRow1 > 1)
 							{
-								parseCell(sheetFrom, nRow1 - 1, nCol1, std::wstring(cRangeName), NULL);
+								parseCell(sheetFrom, nRow1 - 1, nCol1, std::wstring(cRangeName), NULL, true);
 							}
 						}
 					}
@@ -752,7 +768,7 @@ namespace BinXlsxRW{
 							nRow = nRow1 + *val->m_idx;
 							nCol = nCol1;
 						}
-						parseCell(sheetFrom, nRow, nCol, *val->m_v);
+						parseCell(sheetFrom, nRow, nCol, *val->m_v, NULL, true);
 					}
 				}
 			}

ASCOfficeDocxFile2/DocWrapper/ChartWriter.h

@@ -80,7 +80,7 @@ namespace BinXlsxRW {
 		OOX::Spreadsheet::CWorksheet* toXlsxGetSheet(std::vector<OOX::Spreadsheet::CWorksheet*>& arWorksheets, std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName);
 		void toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>& rows, std::vector<std::wstring>& aSharedStrings);
 		
-		void parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format);
+		void parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format, bool bAlwaysSharedString = false);
 		OOX::Spreadsheet::CCell* parseCreateCell(const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format);
 		void parseStrRef(const OOX::Spreadsheet::CT_StrRef* pStrRef, bool bUpdateRange, const wchar_t* cRangeName);
 		void parseNumRef(const OOX::Spreadsheet::CT_NumRef* pNumRef, bool bUpdateRange, const wchar_t* cRangeName);

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -48,6 +48,8 @@
 
 #include "../../Common/DocxFormat/Source/DocxFormat/App.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/Core.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Endnote.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Footnote.h"
 
 int BinDocxRW::g_nCurFormatVersion = 0;
 
@@ -476,7 +478,7 @@ bool BinDocxRW::CDocxSerializer::getXmlContent(NSBinPptxRW::CBinaryFileReader& o
 {
 	long nLength = oBufferedStream.GetLong();
 	Writers::ContentWriter oTempContentWriter;
-	BinDocxRW::Binary_DocumentTableReader oBinary_DocumentTableReader(oBufferedStream, *m_pCurFileWriter, oTempContentWriter, m_pCurFileWriter->m_pComments);
+	BinDocxRW::Binary_DocumentTableReader oBinary_DocumentTableReader(oBufferedStream, *m_pCurFileWriter, oTempContentWriter);
 	oBinary_DocumentTableReader.ReadDocumentContentOut(nLength);
 
     sOutputXml = oTempContentWriter.m_oContent.GetData();
@@ -564,7 +566,7 @@ bool BinDocxRW::CDocxSerializer::getXmlContentElem(OOX::EElementType eType, NSBi
 {
 	long nLength = oBufferedStream.GetLong();
 	Writers::ContentWriter oTempContentWriter;
-	BinDocxRW::Binary_DocumentTableReader oBinary_DocumentTableReader(oBufferedStream, *m_pCurFileWriter, oTempContentWriter, m_pCurFileWriter->m_pComments);
+	BinDocxRW::Binary_DocumentTableReader oBinary_DocumentTableReader(oBufferedStream, *m_pCurFileWriter, oTempContentWriter);
 
 	if(OOX::et_m_oMathPara == eType)
 	{
@@ -610,3 +612,32 @@ bool BinDocxRW::CDocxSerializer::unpackageFile(const std::wstring& sSrcFileName,
 	
 	return file.unpackage(sSrcFileName, sDstPath);
 }
+bool BinDocxRW::CDocxSerializer::convertFlat(const std::wstring& sSrcFileName, const std::wstring& sDstPath)
+{
+	OOX::CDocxFlat docxflat(sSrcFileName);
+
+	if (false == docxflat.m_pDocument.IsInit())
+		return false;
+
+	OOX::CDocx docx;
+
+	if (docxflat.m_pDocument.IsInit())
+	{
+		NSCommon::smart_ptr<OOX::File> file = docxflat.m_pDocument.GetPointer(); file.AddRef();
+		docx.Add(file);
+		docx.m_oMain.document = docxflat.m_pDocument.GetPointer();
+	}
+	if (docxflat.m_pApp.IsInit())
+	{
+		NSCommon::smart_ptr<OOX::File> file(docxflat.m_pApp.GetPointer()); file.AddRef();
+		docx.Add(file);
+	}
+	if (docxflat.m_pCore.IsInit())
+	{
+		NSCommon::smart_ptr<OOX::File> file(docxflat.m_pCore.GetPointer()); file.AddRef();
+		docx.Add(file);
+	}	
+	//docxflat.m_oBgPict.GetPointer();
+
+	return docx.Write(sDstPath);
+}

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h

@@ -66,6 +66,7 @@ namespace BinDocxRW
         bool saveToFile     (const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sTempPath);
 		
 		bool unpackageFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath);
+		bool convertFlat(const std::wstring& sSrcFileName, const std::wstring& sDstPath);
 
         bool CreateDocxFolders(std::wstring strDirectory, std::wstring& sThemePath, std::wstring& sMediaPath, std::wstring& sEmbedPath);
 		

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -42,7 +42,6 @@
 #include "ChartWriter.h"
 
 #include "../BinReader/DefaultThemeWriter.h"
-//#include "../../Common/DocxFormat/Source/XlsxFormat/Chart/Chart.h"
 
 namespace BinXlsxRW{
 	int g_nCurFormatVersion = 0;
@@ -99,16 +98,16 @@ namespace BinXlsxRW{
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;		
 		return oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions, m_bIsMacro);
 	}
-    _UINT32 CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)
+	_UINT32 CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)
 	{
 		COfficeFontPicker* pFontPicker = new COfficeFontPicker();
 		pFontPicker->Init(m_sFontDir);
-        NSFonts::IFontManager* pFontManager = pFontPicker->get_FontManager();
+		NSFonts::IFontManager* pFontManager = pFontPicker->get_FontManager();
 		DocWrapper::FontProcessor fp;
 		fp.setFontManager(pFontManager);
-		
+
 		NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager = NULL;
-        if(false == m_sEmbeddedFontsDir.empty())
+		if (false == m_sEmbeddedFontsDir.empty())
 		{
 			NSDirectory::CreateDirectory(m_sEmbeddedFontsDir);
 
@@ -121,12 +120,12 @@ namespace BinXlsxRW{
 			//pEmbeddedFontsManager добавляются все цифры
 			//для заголовков
 			pEmbeddedFontsManager->CheckFont(_T("Calibri"), pFontManager);
-            pEmbeddedFontsManager->CheckString(std::wstring(_T("ABCDEFGHIJKLMNOPQRSTUVWXYZ")));
+			pEmbeddedFontsManager->CheckString(std::wstring(_T("ABCDEFGHIJKLMNOPQRSTUVWXYZ")));
 
 			//дополнение для ошибок "#NULL!", "#DIV/0!"...
-            pEmbeddedFontsManager->CheckString(std::wstring(_T("#!/?")));
+			pEmbeddedFontsManager->CheckString(std::wstring(_T("#!/?")));
 			//дополнение для num форматов по умолчанию с id от 0 до 49
-            pEmbeddedFontsManager->CheckString(std::wstring(_T(".%E+-():")));
+			pEmbeddedFontsManager->CheckString(std::wstring(_T(".%E+-():")));
 		}
 
 		NSBinPptxRW::CDrawingConverter oOfficeDrawingConverter;
@@ -140,7 +139,19 @@ namespace BinXlsxRW{
 		RELEASEOBJECT(pFontPicker);
 		return result;
 	}
- 	bool CXlsxSerializer::saveChart(NSBinPptxRW::CBinaryFileReader* pReader, long lLength, NSCommon::smart_ptr<OOX::File> &file, const int& nChartNumber)
+	_UINT32 CXlsxSerializer::xml2Xlsx(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions)
+	{
+		std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
+
+		NSBinPptxRW::CDrawingConverter oDrawingConverter;
+
+		oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"xl");
+		oDrawingConverter.SetSrcPath(strFileInDir, 2);
+
+		BinXlsxRW::BinaryFileReader oBinaryFileReader;
+		return oBinaryFileReader.Xml2Xlsx(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions, m_bIsMacro);
+	}
+ 	bool CXlsxSerializer::saveChart(NSBinPptxRW::CBinaryFileReader* pReader, long lLength, NSCommon::smart_ptr<OOX::File> &file)
 	{
 		if (NULL == pReader) return false;
 		if (NULL == m_pExternalDrawingConverter) return false;
@@ -181,7 +192,7 @@ namespace BinXlsxRW{
 		NSCommon::smart_ptr<OOX::Spreadsheet::CChartFile> chart_file = file.smart_dynamic_cast<OOX::Spreadsheet::CChartFile>();
 		if (chart_file.IsInit())
 		{
-			sFileName = L"chart" + std::to_wstring(nChartNumber) + L".xml";
+			sFileName = L"chart" + std::to_wstring(chart_file->GetGlobalNumber()) + L".xml";
 			
 			bResult = (0 == oBinaryChartReader.ReadCT_ChartFile(lLength, chart_file.GetPointer()));
 
@@ -217,7 +228,7 @@ namespace BinXlsxRW{
 			NSCommon::smart_ptr<OOX::Spreadsheet::CChartExFile> chartEx_file = file.smart_dynamic_cast<OOX::Spreadsheet::CChartExFile>();
 			if (chartEx_file.IsInit())
 			{		
-				sFileName = L"chartEx" + std::to_wstring(nChartNumber) + L".xml";
+				sFileName = L"chartEx" + std::to_wstring(chartEx_file->GetGlobalNumber()) + L".xml";
 
 				bResult = (0 == oBinaryChartReader.ReadCT_ChartExFile(lLength, chartEx_file.GetPointer()));
 				

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h

@@ -59,13 +59,11 @@ namespace BinXlsxRW {
 	public:
 		CXlsxSerializer();
 		~CXlsxSerializer();
-		
-        static void CreateXlsxFolders  (const std::wstring& sXmlOptions, const std::wstring& sDstPath, std::wstring& sMediaPath, std::wstring& sEmbedPath);
 
         _UINT32 loadFromFile	(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedPath);
-        _UINT32 saveToFile		(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions);
-		
-        bool saveChart          (NSBinPptxRW::CBinaryFileReader* pReader, long lLength, NSCommon::smart_ptr<OOX::File> &file, const int& nChartNumber);
+        _UINT32 saveToFile		(const std::wstring& sDstPath, const std::wstring& sSrcFileName, const std::wstring& sXMLOptions);
+//------------------------------------------------		
+        static void CreateXlsxFolders  (const std::wstring& sXmlOptions, const std::wstring& sDstPath, std::wstring& sMediaPath, std::wstring& sEmbedPath);
 		
         void setFontDir			(const std::wstring& sFontDir);
         void setEmbeddedFontsDir(const std::wstring& sEmbeddedFontsDir);
@@ -73,6 +71,9 @@ namespace BinXlsxRW {
 		void setIsNoBase64		(bool val);
 		void setMacroEnabled	(bool val);
 
+		_UINT32 xml2Xlsx		(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions);
+		
+		bool saveChart          (NSBinPptxRW::CBinaryFileReader* pReader, long lLength, NSCommon::smart_ptr<OOX::File> &file);
 		bool writeChartXlsx     (const std::wstring& sDstFile, NSCommon::smart_ptr<OOX::File> &file);
 		bool hasPivot			(const std::wstring& sSrcPath);
 	};

ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro

@@ -14,6 +14,10 @@ include(../../Common/base.pri)
 #BOOST
 include($$PWD/../../Common/3dParty/boost/boost.pri)
 
+INCLUDEPATH += ../../ASCOfficeXlsFile2/source/XlsFormat
+INCLUDEPATH += ../../ASCOfficeXlsFile2/source/Common
+INCLUDEPATH += ../../Common/DocxFormat/Source/XlsbFormat
+
 DEFINES += UNICODE \
 	_UNICODE \
 	SOLUTION_ASCOFFICEDOCXFILE2 \
@@ -37,6 +41,7 @@ SOURCES += \
     ../../XlsxSerializerCom/Writer/CSVWriter.cpp \
     ../../OfficeCryptReader/source/ECMACryptFile.cpp \
     ../../OfficeCryptReader/source/CryptTransform.cpp \
+    ../BinReader/ReaderClasses.cpp \
     ../BinReader/Readers.cpp \
     ../BinReader/CustomXmlWriter.cpp \
     ../BinReader/FileWriter.cpp

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcxproj

@@ -70,8 +70,8 @@
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>D:\_Work\core\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\_Work\core\Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>../../Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
+    <LibraryPath>../../Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(Platform)\$(Configuration)\</OutDir>

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcxproj.filters

@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Common">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\Common\OfficeFileFormatChecker.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Common\OfficeFileFormatChecker2.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Common\3dParty\pole\pole.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="OdfFileTest.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Common\DocxFormat\Source\Base\unicode_util.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Common">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Common\OfficeFileFormatChecker.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Common\OfficeFileFormatChecker2.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\3dParty\pole\pole.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="OdfFileTest.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\DocxFormat\Source\Base\unicode_util.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+  </ItemGroup>
 </Project>

ASCOfficeOdfFile/formulasconvert/formulasconvert.h

@@ -52,11 +52,11 @@ public:
     std::wstring convert(std::wstring const & expr);
     
     // $Лист1.$A$1 -> Лист1!$A$1
-	std::wstring convert_named_ref(std::wstring const & expr, bool withTableName = true, std::wstring separator = L" ");
+	std::wstring convert_named_ref(std::wstring const & expr, bool withTableName = true, std::wstring separator = L" ", bool bAbsoluteAlways = false);
 	std::wstring get_table_name();
 
 	//a-la convert without check formula
-    std::wstring convert_named_expr(std::wstring const & expr, bool withTableName = true);
+    std::wstring convert_named_expr(std::wstring const & expr, bool withTableName = true, bool bAbsoluteAlways = false);
 	
 	//Sheet2.C3:Sheet2.C19 -> Sheet2!C3:C19
     std::wstring convert_chart_distance(std::wstring const & expr);

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -36,6 +36,7 @@
 
 #include"../../Common/DocxFormat/Source/XML/Utils.h"
 #include "../src/docx/xlsxconversioncontext.h"
+#include "../src/docx/xlsx_utils.h"
 
 namespace cpdoccore {
 namespace formulasconvert {
@@ -52,30 +53,43 @@ namespace formulasconvert {
 
 		void split_distance_by(const std::wstring& expr, const std::wstring& by, std::vector<std::wstring>& out);
 		
-		void replace_cells_range(std::wstring& expr, bool withTableName);
+		void replace_cells_range(std::wstring& expr, bool withTableName, bool bAbsoluteAlways = false);
 		bool check_formula(std::wstring& expr);
 		void replace_semicolons(std::wstring& expr);
 		void replace_tilda(std::wstring& expr);
 		void replace_vertical(std::wstring& expr);
 		void replace_space(std::wstring& expr);
+		void replace_apersand(std::wstring& expr);
 	
-		std::wstring convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator);
-		std::wstring convert_named_expr(const std::wstring& expr, bool withTableName);
+		std::wstring convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator, bool bAbsoluteAlways);
+		std::wstring convert_named_expr(const std::wstring& expr, bool withTableName, bool bAbsoluteAlways);
 		
 		static std::wstring replace_named_ref_formater(boost::wsmatch const & what);
 		static std::wstring replace_named_ref_formater1(boost::wsmatch const & what);
 		//static std::wstring replace_cell_range_formater(boost::wsmatch const & what);
 		
 		void replace_named_formula(std::wstring & expr, bool w = true);
-		void replace_named_ref(std::wstring & expr, bool w = true);
+		void replace_named_ref(std::wstring & expr, bool withTable = true, bool bAbsoluteAlways = false);
 		
 		bool find_first_ref(std::wstring const & expr, std::wstring & table,  std::wstring & ref);
 		bool find_first_last_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref_first,std::wstring & ref_last);
 	
-		static bool						convert_with_TableName;
-		static std::wstring				table_name_;
+		static bool				convert_with_absolute;
+		static bool				convert_with_TableName;
+		static std::wstring		table_name_;
 
 //-------------------------------------------------------------------------------------------------------------
+		static std::wstring replace_apersand_formater(boost::wsmatch const & what)
+		{
+			if (what[1].matched)
+				return L"&amp;";
+			else if (what[2].matched)
+				return what[2].str();
+			else if (what[3].matched)
+				return what[3].str();
+			else
+				return L"";
+		}
 		static std::wstring replace_semicolons_formater(boost::wsmatch const & what)
 		{
 			if (what[1].matched)
@@ -128,6 +142,7 @@ namespace formulasconvert {
 			XmlUtils::replace_all( expr, L"PROBEL", L" ");
 			//XmlUtils::replace_all( expr, L"APOSTROF", L"'");	
 			//XmlUtils::replace_all( expr, L"KAVYCHKA", L"\"");
+			XmlUtils::replace_all(expr, L"APERSAND", L"&");
 		}
 		static void replace_tmp(std::wstring &expr)
 		{
@@ -172,6 +187,10 @@ namespace formulasconvert {
 					{
 						result += L"PROBEL";
 					}break;
+					case '&':
+					{
+						result += L"APERSAND";
+					}break;
 					default:
 					{
 						result += expr[pos];
@@ -242,6 +261,7 @@ namespace formulasconvert {
 	};
 	bool			odf2oox_converter::Impl::convert_with_TableName = true;
 	std::wstring	odf2oox_converter::Impl::table_name_			= L"";
+	bool			odf2oox_converter::Impl::convert_with_absolute	= false;
 	
 	std::unordered_map<std::wstring, int> &odf2oox_converter::Impl::mapExternalLink_ = oox::xlsx_conversion_context::mapExternalLink_;
 
@@ -347,7 +367,6 @@ namespace formulasconvert {
 		std::wstring ref2		= sz == 7 ? what[6].str() : what[5].str();
 		
 		XmlUtils::replace_all( sheet1, L"$", L"");
-		//XmlUtils::replace_all( sheet2, L"$", L"");
 
 		std::wstring result;
 
@@ -381,6 +400,20 @@ namespace formulasconvert {
 		}
 		
 		table_name_ = sheet1;
+
+		if (convert_with_absolute)
+		{
+			size_t col = 0, row = 0;
+			oox::getCellAddressInv(ref1, col, row);
+
+			ref1 = oox::getCellAddress(col, row, true);
+
+			if (false == ref2.empty())
+			{
+				oox::getCellAddressInv(ref2, col, row);
+				ref2 = oox::getCellAddress(col, row, true);
+			}
+		}
 		
 		if (convert_with_TableName)
 		{
@@ -413,13 +446,14 @@ namespace formulasconvert {
 	// [Sheet2.A1:B5] -> Sheet2!A1:B5
 	// [Sheet2.A1] -> Sheet2!A1
 	// [$'Sheet2 A'.$B2] -> 'Sheet2 A'!$B2
-	void odf2oox_converter::Impl::replace_cells_range(std::wstring& expr, bool withTableName)
+	void odf2oox_converter::Impl::replace_cells_range(std::wstring& expr, bool withTableName, bool bAbsoluteAlways)
 	{
 		XmlUtils::replace_all( expr, L"#REF !", L"#REF!");
 		XmlUtils::replace_all( expr, L"#REF!#REF!", L"#REF!");
 		XmlUtils::replace_all( expr, L"$#REF!$#REF!", L"#REF!");
 
 		convert_with_TableName = withTableName;
+		convert_with_absolute = bAbsoluteAlways;
 
 		//boost::wregex complexRef(L"\\[(?:\'([^\']*)\'#){0,1}\\[{0,1}(?:\\$){0,1}([^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::(\\${0,1}[^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}\\]{0,1}");
 		boost::wregex complexRef(L"(?:(?:(?:(?:\\[\'([^\']*)\'#)|(?:\'([^\']*)\'#\\[)))|(?:\\[))\
@@ -432,13 +466,14 @@ namespace formulasconvert {
 			&replace_named_ref_formater,
 			boost::match_default | boost::format_all);
 	}
-	void odf2oox_converter::Impl::replace_named_ref(std::wstring & expr, bool withTableName)
+	void odf2oox_converter::Impl::replace_named_ref(std::wstring & expr, bool withTableName, bool bAbsoluteAlways)
 	{
 		XmlUtils::replace_all( expr, L"#REF !", L"#REF!");
 		XmlUtils::replace_all( expr, L"#REF!#REF!", L"#REF!");
 		XmlUtils::replace_all( expr, L"$#REF!$#REF!", L"#REF!");
 
 		convert_with_TableName = withTableName;
+		convert_with_absolute = bAbsoluteAlways;
 		
 		//boost::wregex complexRef(L"\\${0,1}([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)(?::\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)){0,1}");
 		boost::wregex complexRef(L"\\[{0,1}(?:\'([^\']*)\'#){0,1}\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}\\]{0,1}");
@@ -495,6 +530,17 @@ namespace formulasconvert {
 
 		 expr = res;
 	}
+	void odf2oox_converter::Impl::replace_apersand(std::wstring& expr)
+	{
+		const std::wstring res = boost::regex_replace(
+			expr,
+			//boost::wregex(L"(;)|(?:\".*?\")|(?:'.*?')"),
+			boost::wregex(L"(&)|(\".*?\")|('.*?')"),
+			&replace_apersand_formater,
+			boost::match_default | boost::format_all);
+
+		expr = res;
+	}
 	// заменить вертикальную черту во всех вхождениях в фигурных скобках, но не внутри строк
 	void odf2oox_converter::Impl::replace_vertical(std::wstring& expr)
 	{
@@ -531,7 +577,8 @@ namespace formulasconvert {
 		replace_semicolons	(workstr);
 		replace_tilda		(workstr);
 		replace_vertical	(workstr);
-		
+		replace_apersand	(workstr);
+
 		if (isFormula)
 		{
 			XmlUtils::replace_all( workstr, L"FDIST(", L"_xlfn.F.DIST(");
@@ -585,8 +632,6 @@ namespace formulasconvert {
 			boost::wregex(L"('.*?')|(\".*?\")"),
 			&convert_scobci, boost::match_default | boost::format_all);
 	    
-		//распарсить по диапазонам - одф-пробел, ик-эль-запятая
-
 		std::vector<std::wstring> distance_inp;
 		std::vector<std::wstring> distance_out;
 
@@ -603,11 +648,18 @@ namespace formulasconvert {
 			for (size_t j = 0; j < range.size(); j++)
 			{
 				const std::string::size_type colon = range[j].find('.');
-				cells.push_back(range[j].substr(colon + 1));
-				if (sheet.size() < 1)
+
+				if (colon != std::wstring::npos)
 				{
-					sheet = range[j].substr(0, colon);
+					cells.push_back(range[j].substr(colon + 1));
+
+					if (sheet.empty())
+					{
+						sheet = range[j].substr(0, colon);
+					}
 				}
+				else
+					cells.push_back(range[j]);
 			}
 			std::wstring cells_out;
 			for (size_t j = 0; j < cells.size(); j++)
@@ -621,7 +673,7 @@ namespace formulasconvert {
 				sheet = L"'" + sheet + L"'";
 			}
 
-			distance_out.push_back(sheet + L"!" + cells_out.substr(0, cells_out.size()-1));
+			distance_out.push_back((sheet.empty() ? L"" : (sheet + L"!")) + cells_out.substr(0, cells_out.size() - 1));
 		}
 		std::wstring result;
 
@@ -634,7 +686,7 @@ namespace formulasconvert {
 		
 		return result.substr(0, result.size() - 1);// минус последняя лишняя запятая
 	}
-	std::wstring odf2oox_converter::Impl::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator)
+	std::wstring odf2oox_converter::Impl::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator, bool bAbsoluteAlways)
 	{
 		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
 
@@ -645,7 +697,7 @@ namespace formulasconvert {
 			boost::wregex(L"('.*?')|(\".*?\")"),
 			&convert_scobci, boost::match_default | boost::format_all);
 
-		replace_named_ref(workstr, withTableName);
+		replace_named_ref(workstr, withTableName, bAbsoluteAlways);
 
 		if (separator != L" ")
 		{
@@ -660,7 +712,7 @@ namespace formulasconvert {
 		}
 		return workstr;
 	}
-	std::wstring odf2oox_converter::Impl::convert_named_expr(const std::wstring& expr, bool withTableName)
+	std::wstring odf2oox_converter::Impl::convert_named_expr(const std::wstring& expr, bool withTableName, bool bAbsoluteAlways)
 	{
 		std::wstring workstr = expr;
 
@@ -679,7 +731,7 @@ namespace formulasconvert {
 				&convert_scobci, boost::match_default | boost::format_all);
 
 		   
-			replace_cells_range(workstr, withTableName);
+			replace_cells_range(workstr, withTableName, bAbsoluteAlways);
 			replace_semicolons(workstr);
 			replace_vertical(workstr);
 
@@ -726,13 +778,13 @@ namespace formulasconvert {
 	{
 		return impl_->split_distance_by(expr, by, out);
 	}
-	std::wstring odf2oox_converter::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator)
+	std::wstring odf2oox_converter::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator, bool bAbsoluteAlways)
 	{
-		return impl_->convert_named_ref(expr, withTableName, separator);
+		return impl_->convert_named_ref(expr, withTableName, separator, bAbsoluteAlways);
 	}
-	std::wstring odf2oox_converter::convert_named_expr(const std::wstring& expr, bool withTableName)
+	std::wstring odf2oox_converter::convert_named_expr(const std::wstring& expr, bool withTableName, bool bAbsoluteAlways)
 	{
-		return impl_->convert_named_expr(expr, withTableName);
+		return impl_->convert_named_expr(expr, withTableName, bAbsoluteAlways);
 	}
 
 	std::wstring odf2oox_converter::convert_ref(std::wstring const & expr)

ASCOfficeOdfFile/include/common/readdocelement.h

@@ -34,6 +34,7 @@
 #include <string>
 
 #include "../CPSharedPtr.h"
+#include "../xml/nodetype.h"
 
 namespace cpdoccore { 
 

ASCOfficeOdfFile/include/common/readstring.h

@@ -32,7 +32,7 @@
 #pragma once
 
 #include "../CPOptional.h"
-#include "logging.h"
+#include "../logging.h"
 
 namespace cpdoccore { 
 namespace common {

ASCOfficeOdfFile/include/odf/odf_elements_type.h

@@ -116,6 +116,7 @@ enum ElementType
 	typeDcDescription,
 	typeDcSubject,
 	typeDcTitle,
+	typeDcLanguage,
 
 	typeDrawA,
 
@@ -449,6 +450,9 @@ enum ElementType
 	typeOfficeMetaKeyword,
 	typeOfficeMetaEditingCycles,
 	typeOfficeMetaEditingDuration,
+	typeOfficeMetaCommon,
+	typeOfficeMetaInitialCreator,
+	typeOfficeMetaTemplate,
 
 	typeDrawBase,
  	typeDrawG,

ASCOfficeOdfFile/include/xml/simple_xml_writer.h

@@ -1,327 +1,330 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2019
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * 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 20A-12 Ernesta Birznieka-Upisha
- * street, Riga, Latvia, EU, LV-1050.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * 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 <string>
-#include <iostream>
-#include <sstream>
-#include <stack>
-#include <cassert>
-
-namespace cpdoccore 
-{
-
-namespace xml 
-{
-
-namespace writer 
-{
-
-    template <class T> struct chars { };
-    
-    template <>
-    struct chars<char>
-    {
-        static const char eq = '=';
-        static const char quote = '\"';
-        static const char space = ' ';
-        static const char left_brocket = '<';
-        static const char right_brocket = '>';
-        static const char slash = '/';
-        static const char colon = ':';
-        static const char amp = '&';
-        static const char apos = '\'';
-        static const char * cdata_open() { return "<![CDATA["; }
-        static const char * cdata_close() { return "]]>"; }
-        static const char * amp_str(){ return "&amp;"; }
-        static const char * left_brocket_str() { return "&lt;"; }
-        static const char * right_brocket_str() { return "&gt;"; }
-        static const char * apos_str() { return "&apos;"; }
-        static const char * quote_str() { return "&quot;"; }
-    };
-
-    template <>
-    struct chars<wchar_t>
-    {
-        static const wchar_t eq = L'=';
-        static const wchar_t quote = L'\"';
-        static const wchar_t space = L' ';
-        static const wchar_t left_brocket = L'<';
-        static const wchar_t right_brocket = L'>';
-        static const wchar_t slash = L'/';
-        static const wchar_t colon = L':';
-        static const wchar_t amp = L'&';
-        static const wchar_t apos = L'\'';
-        static const wchar_t * cdata_open() { return L"<![CDATA["; }
-        static const wchar_t * cdata_close() { return L"]]>"; }
-        static const wchar_t * amp_str(){ return L"&amp;"; }
-        static const wchar_t * left_brocket_str() { return L"&lt;"; }
-        static const wchar_t * right_brocket_str() { return L"&gt;"; }
-        static const wchar_t * apos_str() { return L"&apos;"; }
-        static const wchar_t * quote_str() { return L"&quot;"; }
-    };
-
-    template <class V>
-    class element;
-
-    //
-    //  xml::writer class
-    //
-    template <class T>
-    class writer
-    {
-    public:
-        // writer must be bound to an ostream
-        writer(std::basic_ostream<T>& os, bool need_header = false) : level_(0), os_(os), need_header_(need_header) {}
-        ~writer(void) { assert(elements_.empty()); }
-
-    private:
-        size_t level_;
-        std::basic_ostream<T>& os_;      // output stream
-        bool need_header_;               // have we written an XML header yet?
-        std::stack<element<T>*> elements_;  // stack of open element tags
-        
-
-        // write XML header, if necessary
-        writer& header() 
-        {
-            if (need_header_) 
-            {
-                // TODO
-                //os_ << "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
-                need_header_ = false;
-            }
-            return *this;
-        }
-
-        // write a single character to the output stream
-        writer& putc(T c) 
-        {
-            os_.put(c);
-            return *this;
-        }
-
-        // write a string to the output stream
-        writer& puts(const T* str) {
-            os_ << str;
-            return *this;
-        }
-
-        template <class V>
-        friend class element;
-    };
-
-    //
-    //  xml::element class
-    //
-    template <class T>
-    class element
-    {
-    public:
-        // create a new element tag, bound to an xml::writer
-        element(writer<T>& wr, std::basic_string<T, std::char_traits<T>, std::allocator<T> > const & name) : wr_(wr), name_(name)
-        {
-            wr_.level_++;
-            check_parent();
-            wr_.header().putc('<').puts(name_.c_str());
-            tagopen_ = true;
-            wr_.elements_.push(this);
-        }
-
-        // close the current element tag
-        ~element() 
-        {
-            if (!wr_.elements_.empty() && wr_.elements_.top() == this) 
-            {
-                wr_.elements_.pop();
-                if (tagopen_)
-                    wr_.putc(chars<T>::slash)
-                    .putc(chars<T>::right_brocket);
-                else
-                    wr_.putc(chars<T>::left_brocket)
-                    .putc(chars<T>::slash)
-                    .puts(name_.c_str())
-                    .putc(chars<T>::right_brocket);
-            }
-            wr_.level_--;
-        }
-
-        // write an attribute for the current element
-        element& attr(const T* name, const T* value) 
-        {
-            assert(name != 0);
-            assert(value != 0);
-            assert(tagopen_);
-            wr_.putc(chars<T>::space)
-                .puts(name)
-                .putc(chars<T>::eq)
-                .putc(chars<T>::quote);
-            qputs(value);
-            wr_.putc(chars<T>::quote);
-            return *this;
-        }
-
-        // attr() overload for std::string type
-        element& attr(const T* name, const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& value) 
-        { 
-            return attr(name, value.c_str()); 
-        }
-
-        // attr() function template for all streamable types
-        template <class V>
-        element& attr(const T* name, V value) 
-        {
-            std::basic_stringstream<T, std::char_traits<T>,	std::allocator<T> > ss;
-            ss << value;
-            attr(name, ss.str());
-            return *this;
-        }
-
-        // write text content for the current element
-        element& contents(const T* str) 
-        {
-            assert(str != 0);
-            check_parent();
-            qputs(str);
-            return *this;
-        }
-
-        // contents() overload for std::string type
-        element& contents(const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str) 
-        { 
-            return contents(str.c_str()); 
-        }
-
-        // contents() function template for all streamable types
-        template <class V>
-        element& contents(V value) 
-        {
-            std::basic_stringstream<T, std::char_traits<T>,	std::allocator<T> > ss;
-            ss << value;
-            contents(ss.str());
-            return *this;
-        }
-
-        std::basic_ostream<T>& stream()
-        {
-            check_parent();
-            return wr_.os_;            
-        }
-
-        // write CDATA section
-        element& cdata(const T * str) 
-        {
-            assert(str != 0);
-            check_parent();
-            wr_.puts(chars<T>::cdata_open());
-            wr_.puts(str);
-            wr_.puts(chars<T>::cdata_close());
-            return *this;
-        }
-
-        // cdata() overload for std::string type
-        element& cdata(const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str) 
-        { 
-            return cdata(str.c_str()); 
-        }
-
-    private:
-        writer<T>& wr_;        // bound XML writer
-        //const T* name_;     // name of current element
-        const std::basic_string<T, std::char_traits<T>, std::allocator<T> > name_;
-        bool tagopen_;      // is the element tag for this element still open?
-
-        // write a string quoting characters which have meaning in xml
-        element& qputs(const T* str) 
-        {
-            for (; *str; ++str)
-            {
-                switch (*str) 
-                {
-                case chars<T>::amp: 
-                    wr_.puts(chars<T>::amp_str()); break;
-
-                case chars<T>::left_brocket:
-                    wr_.puts(chars<T>::left_brocket_str()); break;
-
-                case chars<T>::right_brocket: 
-                    wr_.puts(chars<T>::right_brocket_str()); break;
-
-                case chars<T>::apos: 
-                    wr_.puts(chars<T>::apos_str()); break;
-
-                case chars<T>::quote: 
-                    wr_.puts(chars<T>::quote_str()); break;
-
-                default: 
-                    wr_.putc(*str); break;
-                }
-            }
-            return *this;
-        }
-
-        // check to see if we have a parent tag which needs to be closed
-        void check_parent() 
-        {
-            if (!wr_.elements_.empty() && wr_.elements_.top()->tagopen_) 
-            {
-                wr_.putc(chars<T>::right_brocket);
-                wr_.elements_.top()->tagopen_ = false;
-            }
-        }
-    };
-
-}
-
-}
-
-typedef xml::writer::writer<wchar_t> xml_writer;
-typedef xml::writer::element<wchar_t> xml_element;
-
-#define CP_XML_WRITER(STRM) if (bool _b_ = false) {} else for (xml_writer _xml_wr_((STRM));!_b_;_b_=true)
-#define CP_XML_NODE(NAME) if (bool _b_ = false) {} else for (xml_element _xml_node_(_xml_wr_, (NAME));!_b_;_b_=true)
-#define CP_XML_ATTR(NAME, VAL) _xml_node_.attr((NAME),(VAL))
-#define CP_XML_ATTR2(NAME, VAL) _xml_node_.attr((std::wstring(NAME).c_str()),(VAL))
-#define CP_XML_CONTENT(VAL) _xml_node_.contents((VAL))
-#define CP_XML_STREAM() _xml_node_.stream()
-
-#define CP_GET_XML_NODE() _xml_node_
-
-#define CP_ATTR_NODE xml_element & _xml_node_
-
-
-
-#define CP_XML_ATTR_OPT(NAME, VAL) if (VAL)CP_XML_ATTR(NAME, (*VAL))
-
-#define CP_XML_NODE_SIMPLE() std::wstring NS_NAME = std::wstring(ns) + std::wstring(L":") + std::wstring(name); CP_XML_NODE(NS_NAME)
-
-}
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * 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 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * 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 <string>
+#include <iostream>
+#include <sstream>
+#include <stack>
+#include <cassert>
+
+namespace cpdoccore 
+{
+
+namespace xml 
+{  
+
+namespace writer 
+{
+
+    template <class T> struct chars { };
+    
+    template <>
+    struct chars<char>
+    {
+        static const char eq = '=';
+        static const char quote = '\"';
+        static const char space = ' ';
+        static const char left_brocket = '<';
+        static const char right_brocket = '>';
+        static const char slash = '/';
+        static const char colon = ':';
+        static const char amp = '&';
+        static const char apos = '\'';
+        static const char * cdata_open() { return "<![CDATA["; }
+        static const char * cdata_close() { return "]]>"; }
+        static const char * amp_str(){ return "&amp;"; }
+        static const char * left_brocket_str() { return "&lt;"; }
+        static const char * right_brocket_str() { return "&gt;"; }
+        static const char * apos_str() { return "&apos;"; }
+        static const char * quote_str() { return "&quot;"; }
+    };
+
+    template <>
+    struct chars<wchar_t>
+    {
+        static const wchar_t eq = L'=';
+        static const wchar_t quote = L'\"';
+        static const wchar_t space = L' ';
+        static const wchar_t left_brocket = L'<';
+        static const wchar_t right_brocket = L'>';
+        static const wchar_t slash = L'/';
+        static const wchar_t colon = L':';
+        static const wchar_t amp = L'&';
+        static const wchar_t apos = L'\'';
+        static const wchar_t * cdata_open() { return L"<![CDATA["; }
+        static const wchar_t * cdata_close() { return L"]]>"; }
+        static const wchar_t * amp_str(){ return L"&"/* L"&amp;"*/; }
+        static const wchar_t * left_brocket_str() { return L"&lt;"; }
+        static const wchar_t * right_brocket_str() { return L"&gt;"; }
+        static const wchar_t * apos_str() { return L"&apos;"; }
+        static const wchar_t * quote_str() { return L"&quot;"; }
+    };
+
+    template <class V>
+    class element;
+
+    //
+    //  xml::writer class
+    //
+    template <class T>
+    class writer
+    {
+    public:
+        // writer must be bound to an ostream
+        writer(std::basic_ostream<T>& os, bool need_header = false) : level_(0), os_(os), need_header_(need_header) {}
+        ~writer(void) { assert(elements_.empty()); }
+
+    private:
+        size_t level_;
+        std::basic_ostream<T>& os_;      // output stream
+        bool need_header_;               // have we written an XML header yet?
+        std::stack<element<T>*> elements_;  // stack of open element tags
+        
+
+        // write XML header, if necessary
+        writer& header() 
+        {
+            if (need_header_) 
+            {
+                // TODO
+                //os_ << "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+                need_header_ = false;
+            }
+            return *this;
+        }
+
+        // write a single character to the output stream
+        writer& putc(T c) 
+        {
+            os_.put(c);
+            return *this;
+        }
+
+        // write a string to the output stream
+        writer& puts(const T* str) {
+            os_ << str;
+            return *this;
+        }
+
+        template <class V>
+        friend class element;
+    };
+
+    //
+    //  xml::element class
+    //
+    template <class T>
+    class element
+    {
+    public:
+        // create a new element tag, bound to an xml::writer
+        element(writer<T>& wr, std::basic_string<T, std::char_traits<T>, std::allocator<T> > const & name) : wr_(wr), name_(name)
+        {
+            wr_.level_++;
+            check_parent();
+            wr_.header().putc('<').puts(name_.c_str());
+            tagopen_ = true;
+            wr_.elements_.push(this);
+        }
+
+        // close the current element tag
+        ~element() 
+        {
+            if (!wr_.elements_.empty() && wr_.elements_.top() == this) 
+            {
+                wr_.elements_.pop();
+                if (tagopen_)
+                    wr_.putc(chars<T>::slash)
+                    .putc(chars<T>::right_brocket);
+                else
+                    wr_.putc(chars<T>::left_brocket)
+                    .putc(chars<T>::slash)
+                    .puts(name_.c_str())
+                    .putc(chars<T>::right_brocket);
+            }
+            wr_.level_--;
+        }
+
+        // write an attribute for the current element
+        element& attr(const T* name, const T* value) 
+        {
+            assert(name != 0);
+            assert(value != 0);
+            assert(tagopen_);
+            wr_.putc(chars<T>::space)
+                .puts(name)
+                .putc(chars<T>::eq)
+                .putc(chars<T>::quote);
+            qputs(value);
+            wr_.putc(chars<T>::quote);
+            return *this;
+        }
+
+        // attr() overload for std::string type
+        element& attr(const T* name, const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& value) 
+        { 
+            return attr(name, value.c_str()); 
+        }
+
+        // attr() function template for all streamable types
+        template <class V>
+        element& attr(const T* name, V value) 
+        {
+            std::basic_stringstream<T, std::char_traits<T>,	std::allocator<T> > ss;
+            ss << value;
+            attr(name, ss.str());
+            return *this;
+        }
+
+        // write text content for the current element
+        element& contents(const T* str) 
+        {
+            assert(str != 0);
+            check_parent();
+            qputs(str);
+            return *this;
+        }
+
+        // contents() overload for std::string type
+        element& contents(const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str) 
+        { 
+            return contents(str.c_str()); 
+        }
+
+        // contents() function template for all streamable types
+        template <class V>
+        element& contents(V value) 
+        {
+            std::basic_stringstream<T, std::char_traits<T>,	std::allocator<T> > ss;              
+            ss << value;
+            contents(ss.str());
+            return *this;
+        }
+
+        std::basic_ostream<T>& stream()
+        {
+            check_parent();
+            return wr_.os_;            
+        }
+
+        // write CDATA section
+        element& cdata(const T * str) 
+        {
+            assert(str != 0);
+            check_parent();
+            wr_.puts(chars<T>::cdata_open());
+            wr_.puts(str);
+            wr_.puts(chars<T>::cdata_close());
+            return *this;
+        }
+
+        // cdata() overload for std::string type
+        element& cdata(const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str) 
+        { 
+            return cdata(str.c_str()); 
+        }
+
+    private:
+        writer<T>& wr_;        // bound XML writer
+        //const T* name_;     // name of current element
+        const std::basic_string<T, std::char_traits<T>, std::allocator<T> > name_;
+        bool tagopen_;      // is the element tag for this element still open?
+
+        // write a string quoting characters which have meaning in xml
+        element& qputs(const T* str) 
+        {
+            for (; *str; ++str)
+            {
+                switch (*str) 
+                {
+                case chars<T>::amp: 
+                    wr_.puts(chars<T>::amp_str()); break;
+
+                case chars<T>::left_brocket:
+                    wr_.puts(chars<T>::left_brocket_str()); break;
+
+                case chars<T>::right_brocket: 
+                    wr_.puts(chars<T>::right_brocket_str()); break;
+
+                case chars<T>::apos: 
+                    wr_.puts(chars<T>::apos_str()); break;
+
+                case chars<T>::quote: 
+                    wr_.puts(chars<T>::quote_str()); break;
+
+                default: 
+                    wr_.putc(*str); break;
+                }
+            }
+            return *this;
+        }
+
+        // check to see if we have a parent tag which needs to be closed
+        void check_parent() 
+        {
+            if (!wr_.elements_.empty() && wr_.elements_.top()->tagopen_) 
+            {
+                wr_.putc(chars<T>::right_brocket);
+                wr_.elements_.top()->tagopen_ = false;
+            }
+        }
+    };
+
+}
+
+}
+
+typedef xml::writer::writer<wchar_t> xml_writer;
+typedef xml::writer::element<wchar_t> xml_element;
+
+#define CP_XML_WRITER(STRM) if (bool _b_ = false) {} else for (xml_writer _xml_wr_((STRM));!_b_;_b_=true)
+#define CP_XML_NODE(NAME) if (bool _b_ = false) {} else for (xml_element _xml_node_(_xml_wr_, (NAME));!_b_;_b_=true)
+#define CP_XML_ATTR(NAME, VAL) _xml_node_.attr((NAME),(VAL))
+#define CP_XML_ATTR2(NAME, VAL) _xml_node_.attr((std::wstring(NAME).c_str()),(VAL))
+#define CP_XML_CONTENT(VAL) _xml_node_.contents((VAL))
+#define CP_XML_STREAM() _xml_node_.stream()
+
+#define CP_GET_XML_NODE() _xml_node_
+
+#define CP_ATTR_NODE xml_element & _xml_node_
+
+
+#define CP_XML_ATTR_OPT(NAME, VAL) if (VAL)CP_XML_ATTR(NAME, (*VAL))
+#define CP_XML_ATTR_OPT_ENCODE_STRING(NAME, STR) if (STR)CP_XML_ATTR(NAME, XmlUtils::EncodeXmlString(XmlUtils::EncodeXmlString(*STR)))
+
+#define CP_XML_NODE_SIMPLE() std::wstring NS_NAME = std::wstring(ns) + std::wstring(L":") + std::wstring(name); CP_XML_NODE(NS_NAME)
+
+#define CP_XML_NODE_SIMPLE_NONS() CP_XML_NODE(std::wstring(name))
+
+
+}

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -223,6 +223,7 @@ SOURCES += \
     ../src/odf/datatypes/drawangle.cpp \
     ../src/odf/datatypes/timeperiod.cpp \
     ../src/odf/datatypes/messagetype.cpp \
+    ../src/odf/datatypes/stylecellprotect.cpp \
     ../src/docx/xlsx_conditionalFormatting.cpp \
     ../src/docx/xlsx_dxfs.cpp \
     ../src/docx/docx_content_type.cpp \
@@ -488,6 +489,7 @@ HEADERS += \
     ../src/odf/datatypes/charttimeunit.h \
     ../src/odf/datatypes/timeperiod.h \
     ../src/odf/datatypes/messagetype.h \
+    ./src/odf/datatypes/stylecellprotect.h \
     ../src/docx/docx_content_type.h \
     ../src/docx/docx_conversion_context.h \
     ../src/docx/docx_conversion_state.h \

ASCOfficeOdfFile/linux/odffilereaderlib_odf_datatypes.cpp

@@ -134,5 +134,6 @@
 #include "../src/odf/datatypes/styleprint.cpp"
 #include "../src/odf/datatypes/charttimeunit.cpp"
 #include "../src/odf/datatypes/drawangle.cpp"
-#include "../src/odf/datatypes/messagetype.cpp""
-#include "../src/odf/datatypes/timeperiod.cpp""
+#include "../src/odf/datatypes/messagetype.cpp"
+#include "../src/odf/datatypes/timeperiod.cpp"
+#include "../src/odf/datatypes/stylecellprotect.cpp"

ASCOfficeOdfFile/src/conversionelement.cpp

@@ -33,7 +33,7 @@
 #include <iostream>
 
 #include "conversionelement.h"
-#include "logging.h"
+#include "../include/logging.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/docx_content_type.cpp

@@ -30,9 +30,7 @@
  *
  */
 
-
-#include <xml/attributes.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "docx_content_type.h"
 #include "namespaces.h"

ASCOfficeOdfFile/src/docx/docx_content_type.h

@@ -33,7 +33,9 @@
 
 #include <string>
 #include <iosfwd>
-#include <xml/xmlelement.h>
+#include <vector>
+
+#include "../../include/xml/xmlelement.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -32,9 +32,9 @@
 
 #include <iostream>
 
-#include <xml/utils.h>
-#include <odf/odf_document.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/utils.h"
+#include "../../include/odf/odf_document.h"
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "docx_conversion_context.h"
 
@@ -49,8 +49,9 @@
 #include "docx_package.h"
 #include "xlsx_package.h"
 #include "oox_rels.h"
-#include "logging.h"
+#include "../../include/logging.h"
 
+#include "../../../DesktopEditor/common/SystemUtils.h"
 #include "../../../DesktopEditor/graphics/pro/Fonts.h"
 #include "../../../Common/DocxFormat/Source/XML/Utils.h"
 
@@ -744,7 +745,10 @@ void docx_conversion_context::end_document()
  	get_mediaitems()->dump_rels(notes_context_.endnotesRels(), oox::endnote_place);
   
 	output_document_->get_word_files().set_notes(notes_context_);
-////////////////////////	
+
+	output_document_->get_docProps_files().set_app(package::simple_element::create(L"app.xml", dump_settings_app()));
+	output_document_->get_docProps_files().set_core(package::simple_element::create(L"core.xml", dump_settings_core()));
+
 	for (size_t i = 0; i < charts_.size(); i++)
     {
 		package::chart_content_ptr content = package::chart_content::create();
@@ -755,10 +759,7 @@ void docx_conversion_context::end_document()
 		output_document_->get_word_files().add_charts(content);
 	
 	}    
-////////////////////////////////
 	output_document_->get_word_files().update_rels(*this);
-/////////////////////////////////////
-	
 }
 void docx_conversion_context::dump_bibliography()
 {
@@ -814,12 +815,185 @@ void docx_conversion_context::dump_bibliography()
 	const std::wstring sFileRef		= std::wstring(L"../customXml/item") + std::to_wstring(id) + L".xml";
 
 	output_document_->get_word_files().add_rels(relationship(sRId, sRel, sFileRef));
-
 }
+std::wstring  docx_conversion_context::dump_settings_app()
+{
+	std::wstringstream output;
+	CP_XML_WRITER(output)
+	{
+		CP_XML_NODE(L"Properties")
+		{
+			CP_XML_ATTR(L"xmlns", L"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties");
+			CP_XML_ATTR(L"xmlns:vt", L"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes");
 
+			if (!odf_document_->odf_context().DocProps().template_.empty())
+			{
+				CP_XML_NODE(L"Template")
+				{
+					CP_XML_STREAM() << odf_document_->odf_context().DocProps().template_;
+				}
+			}
+			if (odf_document_->odf_context().DocProps().revision_)
+			{
+				CP_XML_NODE(L"TotalTime")
+				{
+					CP_XML_STREAM() << *odf_document_->odf_context().DocProps().revision_;
+				}
+			}
+			CP_XML_NODE(L"Application")
+			{
+				if (!odf_document_->odf_context().DocProps().application_.empty())
+				{
+					CP_XML_STREAM() << odf_document_->odf_context().DocProps().application_;
+				}
+				else
+				{
+					std::wstring sApplication = NSSystemUtils::GetEnvVariable(NSSystemUtils::gc_EnvApplicationName);
+					if (sApplication.empty())
+						sApplication = NSSystemUtils::gc_EnvApplicationNameDefault;
+					CP_XML_STREAM() << sApplication;
+#if defined(INTVER)
+					std::string s = VALUE2STR(INTVER);
+					CP_XML_STREAM() << L"/" << std::wstring(s.begin(), s.end());
+#endif				
+				}
+			}
+			if (odf_document_->odf_context().DocProps().page_count_)
+			{
+				CP_XML_NODE(L"Pages")
+				{
+					CP_XML_STREAM() << *odf_document_->odf_context().DocProps().page_count_;
+				}
+			}
+			if (odf_document_->odf_context().DocProps().word_count_)
+			{
+				CP_XML_NODE(L"Words")
+				{
+					CP_XML_STREAM() << *odf_document_->odf_context().DocProps().word_count_;
+				}
+			}
+			if (odf_document_->odf_context().DocProps().character_count_)
+			{
+				CP_XML_NODE(L"CharactersWithSpaces")
+				{
+					CP_XML_STREAM() << *odf_document_->odf_context().DocProps().character_count_;
+				}
+			}
+			if (odf_document_->odf_context().DocProps().non_whitespace_character_count_)
+			{
+				CP_XML_NODE(L"Characters")
+				{
+					CP_XML_STREAM() << *odf_document_->odf_context().DocProps().non_whitespace_character_count_;
+				}
+			}
+			if (odf_document_->odf_context().DocProps().paragraph_count_)
+			{
+				CP_XML_NODE(L"Paragraphs")
+				{
+					CP_XML_STREAM() << *odf_document_->odf_context().DocProps().paragraph_count_;
+				}
+			}
+		}
+	}
+	return output.str();
+}
+std::wstring  docx_conversion_context::dump_settings_core()
+{
+	std::wstringstream output;
+	
+	CP_XML_WRITER(output)
+	{
+		CP_XML_NODE(L"cp:coreProperties")
+		{
+			CP_XML_ATTR(L"xmlns:cp", L"http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
+			CP_XML_ATTR(L"xmlns:xsi", L"http://www.w3.org/2001/XMLSchema-instance");
+			CP_XML_ATTR(L"xmlns:dc", L"http://purl.org/dc/elements/1.1/");
+			CP_XML_ATTR(L"xmlns:dcmitype", L"http://purl.org/dc/dcmitype/");
+			CP_XML_ATTR(L"xmlns:dcterms", L"http://purl.org/dc/terms/");
+			
+			if (!odf_document_->odf_context().DocProps().creation_date_.empty())
+			{
+				CP_XML_NODE(L"dcterms:created")
+				{
+					CP_XML_ATTR(L"xsi:type", L"dcterms:W3CDTF");
+					CP_XML_STREAM() << odf_document_->odf_context().DocProps().creation_date_;
+				}
+			}
+			if (!odf_document_->odf_context().DocProps().dc_date_.empty())
+			{
+				CP_XML_NODE(L"dcterms:modified")
+				{
+					CP_XML_ATTR(L"xsi:type", L"dcterms:W3CDTF");
+					CP_XML_STREAM() << odf_document_->odf_context().DocProps().dc_date_;
+				}
+			}
+			if (!odf_document_->odf_context().DocProps().dc_creator_.empty())
+			{
+				CP_XML_NODE(L"dc:creator")
+				{
+					CP_XML_STREAM() << odf_document_->odf_context().DocProps().dc_creator_;
+				}
+			}
+			if (!odf_document_->odf_context().DocProps().dc_title_.empty())
+			{
+				CP_XML_NODE(L"dc:title")
+				{
+					CP_XML_STREAM() << odf_document_->odf_context().DocProps().dc_title_;
+				}
+			}
+			if (!odf_document_->odf_context().DocProps().dc_subject_.empty())
+			{
+				CP_XML_NODE(L"dc:subject")
+				{
+					CP_XML_STREAM() << odf_document_->odf_context().DocProps().dc_subject_;
+				}
+			}
+			if (!odf_document_->odf_context().DocProps().dc_description_.empty())
+			{
+				CP_XML_NODE(L"dc:description")
+				{
+					CP_XML_STREAM() << odf_document_->odf_context().DocProps().dc_description_;
+				}
+			}
+			if (!odf_document_->odf_context().DocProps().dc_language_.empty())
+			{
+				CP_XML_NODE(L"dc:language")
+				{
+					CP_XML_STREAM() << odf_document_->odf_context().DocProps().dc_language_;
+				}
+			}
+			CP_XML_NODE(L"cp:lastModifiedBy")
+			{
+				std::wstring sApplication = NSSystemUtils::GetEnvVariable(NSSystemUtils::gc_EnvApplicationName);
+				if (sApplication.empty())
+					sApplication = NSSystemUtils::gc_EnvApplicationNameDefault;
+				CP_XML_STREAM() << sApplication;
+#if defined(INTVER)
+				std::string s = VALUE2STR(INTVER);
+				CP_XML_STREAM() << L"/" << std::wstring(s.begin(), s.end());
+#endif	
+			}
+			if (!odf_document_->odf_context().DocProps().keyword_.empty())
+			{
+				CP_XML_NODE(L"cp:keywords")
+				{
+					CP_XML_STREAM() << odf_document_->odf_context().DocProps().keyword_;
+				}
+			}
+			if (odf_document_->odf_context().DocProps().revision_)
+			{
+				CP_XML_NODE(L"cp:revision")
+				{
+					CP_XML_STREAM() << *odf_document_->odf_context().DocProps().revision_;
+				}
+			}
+		}
+	}
+	return output.str();
+}
 std::wstring  docx_conversion_context::dump_settings_document()
 {
-	std::wstringstream output(L"");
+	std::wstringstream output;
     CP_XML_WRITER(output)
     {
         CP_XML_NODE(L"w:settings")
@@ -1210,7 +1384,7 @@ void docx_conversion_context::start_process_style_content()
     styles_context_.start();
 }
 
-void docx_conversion_context::process_section(std::wostream & strm, odf_reader::style_columns * columns)//from page layout
+void docx_conversion_context::process_section(std::wostream & strm, odf_reader::style_columns *columns_page)//from page layout
 {
 	if (root()->odf_context().pageLayoutContainer().linenumbering())
 	{
@@ -1222,7 +1396,8 @@ void docx_conversion_context::process_section(std::wostream & strm, odf_reader::
 
 	oox::section_context::_section & section = get_section_context().get_last();
 
-	if (!columns)
+	odf_reader::style_columns *columns = columns_page;
+	//if (!columns)
 	{
 		if (const odf_reader::style_instance * secStyle = root()->odf_context().styleContainer().style_by_name(section.style_, odf_types::style_family::Section, process_headers_footers_))
 		{
@@ -1279,20 +1454,35 @@ void docx_conversion_context::process_section(std::wostream & strm, odf_reader::
 			}		
 			for (size_t i = 0; page_width > 0, i < columns->style_columns_.size(); i++)
 			{
-				odf_reader::style_column * col = dynamic_cast<odf_reader::style_column*>( columns->style_columns_[i].get());
+				odf_reader::style_column *col = dynamic_cast<odf_reader::style_column*>( columns->style_columns_[i].get());
 				if (!col) continue;
 
-				double width = page_width * (col->style_rel_width_ ? col->style_rel_width_->get_value() / 65535. : 0);
-
-				double space = col->fo_end_indent_ ? col->fo_end_indent_->get_value_unit(odf_types::length::pt) : 0;
-
-				if (i < columns->style_columns_.size() - 1)
+				double percent = col->style_rel_width_ ? col->style_rel_width_->get_value() : 0;
+				if (percent > 0x7FFE)
 				{
-					col = dynamic_cast<odf_reader::style_column*>( columns->style_columns_[i + 1].get());
-					space += col->fo_start_indent_ ? col->fo_start_indent_->get_value_unit(odf_types::length::pt) : 0;
+					//auto
+					break;
+				}
+				else
+				{
+					if (percent > 1000.) percent /= 100.;
+
+					double width = page_width * percent / 100.;
+
+					double space_end = col->fo_end_indent_ ? col->fo_end_indent_->get_value_unit(odf_types::length::pt) : 0;
+					double space_start = col->fo_start_indent_ ? col->fo_start_indent_->get_value_unit(odf_types::length::pt) : 0;
+
+					width -= space_end;
+					width -= space_start;
+
+					if (i < columns->style_columns_.size() - 1)
+					{
+						col = dynamic_cast<odf_reader::style_column*>(columns->style_columns_[i + 1].get());
+						space_start = col->fo_start_indent_ ? col->fo_start_indent_->get_value_unit(odf_types::length::pt) : 0;
+					}
+
+					width_space.push_back(std::make_pair(width, space_start + space_end));
 				}
-				
-				width_space.push_back(std::make_pair(width, space));
 			}
 		}
 	}
@@ -1467,12 +1657,12 @@ odf_reader::style_text_properties_ptr docx_conversion_context::current_text_prop
     return cur;
 }
 
-void docx_conversion_context::set_page_break_after(bool val)
+void docx_conversion_context::set_page_break_after(int val)
 {
     page_break_after_ = val;
 }
 
-bool docx_conversion_context::get_page_break_after()
+int docx_conversion_context::get_page_break_after()
 {
     return page_break_after_ ;
 }
@@ -1484,12 +1674,12 @@ bool docx_conversion_context::get_page_break()
 {
     return page_break_;
 }
-void docx_conversion_context::set_page_break_before(bool val)
+void docx_conversion_context::set_page_break_before(int val)
 {
     page_break_before_ = val;
 }
 
-bool docx_conversion_context::get_page_break_before()
+int docx_conversion_context::get_page_break_before()
 {
     return page_break_before_;
 }
@@ -1937,15 +2127,8 @@ void docx_conversion_context::process_page_break_after(const odf_reader::style_i
                 _CP_OPT(odf_types::fo_break) fo_break_val = inst->content()->get_style_paragraph_properties()->content_.fo_break_after_;
                 if (fo_break_val)
                 {
-					if (fo_break_val->get_type() == odf_types::fo_break::Page)
-                    {
-                        set_page_break_after(true);     
-                        break;
-                    }
-                    else if (fo_break_val->get_type() == odf_types::fo_break::Auto)
-                    {
-                        break;                    
-                    }
+					set_page_break_after(fo_break_val->get_type());
+					break;
                 }
             }
             inst = inst->parent();
@@ -2185,35 +2368,42 @@ void docx_conversion_context::start_text_changes (const std::wstring &id)
 	
 	map_current_changes_.insert(std::pair<std::wstring, text_tracked_context::_state> (id, state_add));
 
-	if (state_.in_paragraph_ && ( state_add.type == 1 || state_add.type == 2 ))
+	if ( state_add.type == 1 || state_add.type == 2 )
 	{
 		map_changes_iterator it = map_current_changes_.find(id);
 		text_tracked_context::_state  &state = it->second;
-		
-		std::wstring format_change =	L" w:date=\""	+ state.date	+ L"\"" +
-										L" w:author=\""	+ state.author	+ L"\"" ;
 
-		finish_run();
-		state.active		= true;
-		state.in_drawing	= get_drawing_state_content();
-		
-		if (state.type	== 1)
+		if (state_.in_paragraph_)
 		{
+			std::wstring format_change = L" w:date=\"" + state.date + L"\"" +
+				L" w:author=\"" + state.author + L"\"";
 
-			output_stream() << L"<w:ins" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) <<  L"\">";
-		}
-		
-		if (state.type	== 2)
-		{
-			for (size_t i = 0 ; i < state.content.size(); i++)
+			finish_run();
+			state.active = true;
+			state.in_drawing = get_drawing_state_content();
+
+			if (state.type == 1)
 			{
-				output_stream() << L"<w:del" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) <<  L"\">";
-
-				output_stream() << state.content[i];
-
-				output_stream() << L"</w:del>";
+				output_stream() << L"<w:ins" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) << L"\">";
 			}
-			map_current_changes_.erase(it);
+
+			if (state.type == 2)
+			{
+				for (size_t i = 0; i < state.content.size(); i++)
+				{
+					output_stream() << L"<w:del" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) << L"\">";
+
+					output_stream() << state.content[i];
+
+					output_stream() << L"</w:del>";
+				}
+				map_current_changes_.erase(it);
+			}
+		}
+		else
+		{
+			state.in_drawing = get_drawing_state_content();
+			state.out_active = true;
 		}
 	}
 }
@@ -2240,87 +2430,104 @@ void docx_conversion_context::start_changes()
 		change_attr += L" w:date=\"" + state.date + L"\"";
 		change_attr += L" w:author=\"" + state.author + L"\"";
 		change_attr += L" w:id=\"" + std::to_wstring(current_id_changes++) + L"\"";
-
-		if (state.type == 1)
+		
+		if (state.out_active)
 		{
-			text_tracked_context_.dumpRPrInsDel_ = L"<w:ins" + change_attr + L"/>";
-		}
-
-		if (state.type == 2)
-		{
-			text_tracked_context_.dumpRPrInsDel_ = L"<w:del" + change_attr + L"/>";
-		}
-
-		if (state.type == 3 && false == state.style_name.empty())
-		{
-			odf_reader::style_instance * styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Paragraph, false);
-			if (styleInst)
+			if (state.type == 1)
 			{
-				odf_reader::style_paragraph_properties	* props = styleInst->content()->get_style_paragraph_properties();
-				odf_reader::style_text_properties		* props_text = styleInst->content()->get_style_text_properties();
-
-				text_tracked_context_.dumpPPr_ += L"<w:pPrChange" + change_attr;
-
-				if (props)
-				{
-					props->docx_convert(*this);
-					text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_attr().str();
-				}
-				text_tracked_context_.dumpPPr_ += L">";
-
-				if (props)	text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_nodes().str();
-				if (props_text)
-				{
-					props_text->docx_convert(*this);
-
-					text_tracked_context_.dumpPPr_ += L"<w:rPr>";
-					text_tracked_context_.dumpPPr_ += get_styles_context().text_style().str();
-					text_tracked_context_.dumpPPr_ += L"</w:rPr>";
-				}
-				text_tracked_context_.dumpPPr_ += L"</w:pPrChange>";
+				output_stream() << L"<w:ins" + change_attr + L">";
+				state.active = true;
 			}
-			else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Text, false))
+
+			if (state.type == 2)
 			{
-				text_tracked_context_.dumpRPr_ = L"<w:rPrChange" + change_attr + L">";
-				odf_reader::style_text_properties * props = NULL;
-				props = styleInst->content()->get_style_text_properties();
-				if (props)
-				{
-					props->docx_convert(*this);
-					text_tracked_context_.dumpRPr_ += get_styles_context().text_style().str();
-				}
-				text_tracked_context_.dumpRPr_ += L"</w:rPrChange>";
-			}
-			else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Table, false))
-			{
-				text_tracked_context_.dumpTblPr_ = L"<w:TblPrChange" + change_attr + L">";
-				odf_reader::style_table_properties		* props = styleInst->content()->get_style_table_properties();
-				odf_reader::style_table_cell_properties * props_cell = styleInst->content()->get_style_table_cell_properties();
-				if (props)
-				{
-					props->docx_convert(*this);
-					text_tracked_context_.dumpTblPr_ += get_styles_context().table_style().str();
-				}
-				text_tracked_context_.dumpTblPr_ += L"</w:TblPrChange>";
-			}
-			else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::TableCell, false))
-			{
-				text_tracked_context_.dumpTcPr_ = L"<w:TcPrChange" + change_attr + L">";
-				odf_reader::style_table_cell_properties * props = styleInst->content()->get_style_table_cell_properties();
-				if (props)
-				{
-					props->docx_convert(*this);
-					text_tracked_context_.dumpTcPr_ += get_styles_context().table_style().str();
-				}
-				text_tracked_context_.dumpTcPr_ += L"</w:TcPrChange>";
+				output_stream() << L"<w:del" + change_attr + L">";
+				state.active = true;
 			}
 		}
-		else if (state.type == 3 && state.style_name.empty())
+		else
 		{
-			if (state_.in_run_)
-				text_tracked_context_.dumpRPr_ += L"<w:rPrChange" + change_attr + L"/>";
-			else
-				text_tracked_context_.dumpPPr_ += L"<w:pPrChange" + change_attr + L"/>";
+			if (state.type == 1)
+			{
+				text_tracked_context_.dumpRPrInsDel_ = L"<w:ins" + change_attr + L"/>";
+			}
+
+			if (state.type == 2)
+			{
+				text_tracked_context_.dumpRPrInsDel_ = L"<w:del" + change_attr + L"/>";
+			}
+
+			if (state.type == 3 && false == state.style_name.empty())
+			{
+				odf_reader::style_instance * styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Paragraph, false);
+				if (styleInst)
+				{
+					odf_reader::style_paragraph_properties	* props = styleInst->content()->get_style_paragraph_properties();
+					odf_reader::style_text_properties		* props_text = styleInst->content()->get_style_text_properties();
+
+					text_tracked_context_.dumpPPr_ += L"<w:pPrChange" + change_attr;
+
+					if (props)
+					{
+						props->docx_convert(*this);
+						text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_attr().str();
+					}
+					text_tracked_context_.dumpPPr_ += L">";
+
+					if (props)	text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_nodes().str();
+					if (props_text)
+					{
+						props_text->docx_convert(*this);
+
+						text_tracked_context_.dumpPPr_ += L"<w:rPr>";
+						text_tracked_context_.dumpPPr_ += get_styles_context().text_style().str();
+						text_tracked_context_.dumpPPr_ += L"</w:rPr>";
+					}
+					text_tracked_context_.dumpPPr_ += L"</w:pPrChange>";
+				}
+				else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Text, false))
+				{
+					text_tracked_context_.dumpRPr_ = L"<w:rPrChange" + change_attr + L">";
+					odf_reader::style_text_properties * props = NULL;
+					props = styleInst->content()->get_style_text_properties();
+					if (props)
+					{
+						props->docx_convert(*this);
+						text_tracked_context_.dumpRPr_ += get_styles_context().text_style().str();
+					}
+					text_tracked_context_.dumpRPr_ += L"</w:rPrChange>";
+				}
+				else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Table, false))
+				{
+					text_tracked_context_.dumpTblPr_ = L"<w:TblPrChange" + change_attr + L">";
+					odf_reader::style_table_properties		* props = styleInst->content()->get_style_table_properties();
+					odf_reader::style_table_cell_properties * props_cell = styleInst->content()->get_style_table_cell_properties();
+					if (props)
+					{
+						props->docx_convert(*this);
+						text_tracked_context_.dumpTblPr_ += get_styles_context().table_style().str();
+					}
+					text_tracked_context_.dumpTblPr_ += L"</w:TblPrChange>";
+				}
+				else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::TableCell, false))
+				{
+					text_tracked_context_.dumpTcPr_ = L"<w:TcPrChange" + change_attr + L">";
+					odf_reader::style_table_cell_properties * props = styleInst->content()->get_style_table_cell_properties();
+					if (props)
+					{
+						props->docx_convert(*this);
+						text_tracked_context_.dumpTcPr_ += get_styles_context().table_style().str();
+					}
+					text_tracked_context_.dumpTcPr_ += L"</w:TcPrChange>";
+				}
+			}
+			else if (state.type == 3 && state.style_name.empty())
+			{
+				if (state_.in_run_)
+					text_tracked_context_.dumpRPr_ += L"<w:rPrChange" + change_attr + L"/>";
+				else
+					text_tracked_context_.dumpPPr_ += L"<w:pPrChange" + change_attr + L"/>";
+			}
 		}
 	}
 }

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -523,9 +523,11 @@ public:
 		std::vector<std::wstring>	content;	//delete elements		
 		bool						active = false;
 		bool						in_drawing = false;
-	
+		bool						out_active = false;
+
 		void clear()
 		{
+			out_active = false;
 			type = 0;
 			id.clear();
 			author.clear();
@@ -793,12 +795,17 @@ public:
 	_rels_type_place get_type_place();
 	
 	void dump_bibliography();
+	
 	std::wstring  dump_settings_document();
+	std::wstring  dump_settings_app();
+	std::wstring  dump_settings_core();
 
  	bool next_dump_page_properties_;
 	bool next_dump_section_;
 	bool last_dump_page_properties_;
 
+	int nFormFieldId_ = 0;
+
     odf_reader::odf_document *root()
     {
         return odf_document_;
@@ -853,11 +860,11 @@ public:
    
 	odf_reader::style_text_properties_ptr current_text_properties();
 
-    void set_page_break_after(bool val);
-    bool get_page_break_after();
+    void set_page_break_after(int val);
+    int get_page_break_after();
 
-    void set_page_break_before(bool val);
-    bool get_page_break_before();
+    void set_page_break_before(int val);
+    int get_page_break_before();
 
 	void set_page_break		(bool val);
     bool get_page_break		();
@@ -994,7 +1001,7 @@ private:
 		std::vector< const odf_reader::style_text_properties*> text_properties_stack_;
 	}state_;
 	std::vector<_context_state> keep_state_;
-	
+//---------------------------------------------------------	
 	std::wstringstream		document_xml_;
     std::wstringstream		styles_xml_;
     std::wstringstream		fontTable_xml_;
@@ -1006,7 +1013,7 @@ private:
     std::wstringstream		header_xml_;
     std::wstringstream		settings_xml_;
     std::wstringstream		meta_xml_;
-
+//--------------------------------------------------------------
 	xlsx_drawing_context_handle_ptr chart_drawing_handle_; 
 
 	styles_context			styles_context_;
@@ -1044,8 +1051,8 @@ private:
     
 	bool first_element_list_item_;
     
-	bool page_break_after_;
-    bool page_break_before_;
+	int page_break_after_; // 0 = false, 1 - column, 2 -page
+    int page_break_before_;
 	bool page_break_;
 
 	bool in_automatic_style_; 

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -31,7 +31,7 @@
  */
 
 #include "docx_drawing.h"
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 #include "../odf/datatypes/custom_shape_types_convert.h"
 
 namespace cpdoccore {
@@ -358,12 +358,12 @@ void docx_serialize_shape_child(std::wostream & strm, _docx_drawing & val)
 }
 void docx_serialize_group_child(std::wostream & strm, _docx_drawing & val)
 {
-	std::wstring	name_node = L"wpg:wgp";
-	if (val.inGroup)name_node = L"wpg:grpSp";
+	std::wstring	node_name = L"wpg:wgp";
+	if (val.inGroup)node_name = L"wpg:grpSp";
 	
 	CP_XML_WRITER(strm)    
     {
-		CP_XML_NODE(name_node)
+		CP_XML_NODE(node_name)
 		{
 			CP_XML_NODE(L"wpg:cNvGrpSpPr")
 			{

ASCOfficeOdfFile/src/docx/docx_drawing.h

@@ -33,9 +33,6 @@
 
 #include <iosfwd>
 #include <iostream>
-#include <CPScopedPtr.h>
-#include <CPOptional.h>
-#include <xml/attributes.h>
 
 #include "oox_drawing.h"
 #include "mediaitems.h"

ASCOfficeOdfFile/src/docx/docx_package.cpp

@@ -509,7 +509,7 @@ docx_document::docx_document()
         relationship(L"rId3", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument", L"word/document.xml" ) 
         );
 
-    rels_files_.add_rel_file( relFile );
+	get_rels_files().add_rel_file( relFile );
 
 }
 int docx_document::add_customXml(customXml_content_ptr customXml)
@@ -523,10 +523,10 @@ void docx_document::write(const std::wstring & RootPath)
         content_type_file_.content()->get_override().push_back( override_content_type(L"/word/numbering.xml",
 				L"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml") );
     }
-    customXml_files_.write	(RootPath);
-    word_files_.write		(RootPath);
-    rels_files_.write		(RootPath);
-    docProps_files_.write	(RootPath);
+    customXml_files_.write (RootPath);
+    word_files_.write (RootPath);
+	get_rels_files().write (RootPath);
+	get_docProps_files().write (RootPath);
     content_type_file_.write(RootPath);
 }
 

ASCOfficeOdfFile/src/docx/docx_package.h

@@ -34,8 +34,6 @@
 #include <string>
 #include <vector>
 
-#include <CPSharedPtr.h>
-
 #include "oox_rels.h"
 #include "docx_content_type.h"
 #include "oox_package.h"
@@ -136,7 +134,7 @@ public:
     void set_fontTable	(element_ptr Element);
     void set_numbering	(element_ptr Element);
     void set_settings	(element_ptr Element);
-    bool has_numbering	();
+	bool has_numbering	();
     void set_media			(mediaitems_ptr		& mediaitems_);
     void set_headers_footers(headers_footers	& HeadersFooters);
     void set_notes			(notes_context		& notesContext);
@@ -185,8 +183,6 @@ private:
     docx_content_types_file	content_type_file_;
     word_files				word_files_;
 	customXml_files			customXml_files_;
-    rels_files				rels_files_;
-    docProps_files			docProps_files_;
 };
 
 }

ASCOfficeOdfFile/src/docx/docx_table_context.cpp

@@ -29,11 +29,12 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
+#include <iostream>
 
 #include "docx_conversion_context.h"
-#include "logging.h"
-#include <iostream>
-#include <odf/odf_document.h>
+
+#include "../../include/logging.h"
+#include "../../include/odf/odf_document.h"
 #include "../odf/odfcontext.h"
 
 namespace cpdoccore { 

ASCOfficeOdfFile/src/docx/drawing_object_description.h

@@ -46,7 +46,12 @@ struct _rect
     double x;
     double y;
 };
-
+enum _anchor_rel
+{
+	anchor_none = 0,
+	anchor_start = 1,
+	anchor_end = 2
+};
 struct drawing_object_description
 {
 	bool									bNotes_;
@@ -58,6 +63,7 @@ struct drawing_object_description
 
 	_CP_OPT(_rect)							svg_rect_;
 
+	_anchor_rel								anchor_rel_;
 	std::wstring							anchor_;
     double									anchor_x_;
     double									anchor_y_;

ASCOfficeOdfFile/src/docx/hyperlinks.cpp

@@ -32,7 +32,7 @@
 
 #include "hyperlinks.h"
 
-#include <xml/utils.h>
+#include "../../include/xml/utils.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/measuredigits.cpp

@@ -32,8 +32,8 @@
 #include "measuredigits.h"
 
 #include <boost/lexical_cast.hpp>
-#include <logging.h>
 
+#include "../../include/logging.h"
 #include "../../../DesktopEditor/graphics/pro/Fonts.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -34,14 +34,14 @@
 
 #include <boost/regex.hpp>
 
-#include <xml/utils.h>
+#include "../../include/xml/utils.h"
 
-#include "../../Common/DocxFormat/Source/Base/Base.h"
-#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
+#include "../../../Common/DocxFormat/Source/Base/Base.h"
+#include "../../../Common/DocxFormat/Source/SystemUtility/File.h"
 
-#include "../../DesktopEditor/common/Directory.h"
-#include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
-#include "../../DesktopEditor/graphics/pro/Fonts.h"
+#include "../../../DesktopEditor/common/Directory.h"
+#include "../../../DesktopEditor/raster/ImageFileFormatChecker.h"
+#include "../../../DesktopEditor/graphics/pro/Fonts.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

@@ -30,10 +30,9 @@
  *
  */
 
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "oox_chart_axis.h"
-#include <xml/simple_xml_writer.h>
-
 #include "oox_title.h"
 #include "oox_chart_shape.h"
 

ASCOfficeOdfFile/src/docx/oox_chart_axis.h

@@ -32,8 +32,8 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
-#include <CPSharedPtr.h>
+#include "../../include/CPOptional.h"
+#include "../../include/CPSharedPtr.h"
 
 #include "oox_chart_shape.h"
 

ASCOfficeOdfFile/src/docx/oox_chart_context.cpp

@@ -32,7 +32,7 @@
 
 
 #include <vector>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "oox_rels.h"
 #include "oox_chart_context.h"

ASCOfficeOdfFile/src/docx/oox_chart_context.h

@@ -32,10 +32,10 @@
 #pragma once
 #include "oox_package.h"
 
-#include <CPNoncopyable.h>
+#include "../../include/CPNoncopyable.h"
 
-#include <CPScopedPtr.h>
-#include <CPSharedPtr.h>
+#include "../../include/CPScopedPtr.h"
+#include "../../include/CPSharedPtr.h"
 
 #include "oox_title.h"
 #include "oox_plot_area.h"
@@ -75,9 +75,12 @@ public:
 	}
 	void set_3D_chart(bool val)
 	{
-		for (size_t i = 0 ; i < plot_area_.charts_.size(); i++)
+		for (size_t i = 0 ; i < plot_area_.charts_.size(); ++i)
 		{
 			plot_area_.charts_[i]->is3D_ = val;
+
+			for (size_t j = 0; j < plot_area_.charts_[i]->series_.size(); ++j)
+				plot_area_.charts_[i]->series_[j]->is3D_ = val;
 		}
 	}
 	void set_externalData(const std::wstring & href);

ASCOfficeOdfFile/src/docx/oox_chart_legend.cpp

@@ -32,11 +32,9 @@
 
 
 #include <boost/functional.hpp>
-#include <CPOptional.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "oox_chart_legend.h"
-
 #include "oox_chart_shape.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/oox_chart_legend.h

@@ -32,8 +32,8 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
-#include <CPScopedPtr.h>
+#include "../../include/CPOptional.h"
+#include "../../include/CPScopedPtr.h"
 
 #include "oox_layout.h"
             

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -34,13 +34,13 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/ref.hpp>
 
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 #include "../odf/style_text_properties.h"
 
 #include "xlsx_utils.h"
 
 #include "oox_chart_series.h"
-#include "../formulasconvert/formulasconvert.h"
+#include "../../formulasconvert/formulasconvert.h"
 
 #include "oox_chart_shape.h"
 
@@ -58,6 +58,7 @@ oox_chart_series::oox_chart_series()
 	iSymbolMarkerType_		= 0;
 	bCacheOnly_				= false;
 	labelPosEnabled_		= true;
+	is3D_					= false;
 }
 void oox_chart_series::setName(const std::wstring &value)
 {
@@ -571,10 +572,30 @@ void oox_bar_series::oox_serialize(std::wostream & _Wostream)
 		CP_XML_NODE(L"c:ser")
 		{
 			oox_serialize_common(CP_XML_STREAM());
+			
+			if (is3D_)
+			{
+				CP_XML_NODE(L"c:shape")
+				{
+					switch (iSolidType.get_value_or(0))
+					{
+					case 1: CP_XML_ATTR(L"val", L"cylinder"); break;
+					case 2: CP_XML_ATTR(L"val", L"cone"); break;
+					case 3: CP_XML_ATTR(L"val", L"pyramid"); break;
+					case 0:
+					default: CP_XML_ATTR(L"val", L"box"); break;
+					}
+				}
+			}
 		}
 	}
 }
+void oox_bar_series::set_properties(std::vector<odf_reader::_property> g)
+{
+	oox_chart_series::set_properties(g);
 
+	odf_reader::GetProperty(g, L"solid-type", iSolidType);
+}
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 _CP_PTR(oox_chart_series) oox_line_series::create()

ASCOfficeOdfFile/src/docx/oox_chart_series.h

@@ -32,7 +32,7 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
+
 #include "../odf/chart_objects.h"
 
 #include "oox_chart_values.h"
@@ -55,6 +55,8 @@ public:
 	
 	virtual void oox_serialize(std::wostream & _Wostream) = 0;
 	
+	bool						is3D_;
+
 	bool						labelPosEnabled_;
 	_oox_chart_values			values_[5]; //cat, common, x, y, bubble, 
 
@@ -78,6 +80,8 @@ public:
 
 	odf_reader::chart::series content_;
 
+	virtual void set_properties(std::vector<odf_reader::_property> g) {}
+
 	//extLst (Chart Extensibility) §21.2.2.64
 	//idx (Index) §21.2.2.84
 	//order (Order) §21.2.2.128
@@ -95,7 +99,11 @@ public:
 	
 	static oox_series_ptr create();
 	
+	virtual void set_properties(std::vector<odf_reader::_property> g);
+
 	virtual void oox_serialize(std::wostream & _Wostream);
+	
+	_CP_OPT(int)	iSolidType;
 };
 	//cat (Category Axis Data) §21.2.2.24
 	//errBars (Error Bars) §21.2.2.55