Merge remote-tracking branch 'origin/hotfix/v5.1.3' into develop

ASCOfficeDocFile/DocDocxConverter/ContentTypes.h

@@ -163,6 +163,7 @@ namespace OpenXmlRelationshipTypes
     static const wchar_t* GlossaryDocument		=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument";
     static const wchar_t* Package				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
     static const wchar_t* VbaProject			=	L"http://schemas.microsoft.com/office/2006/relationships/vbaProject";
+	static const wchar_t* Hyperlink				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
 }
 
 namespace MicrosoftWordRelationshipTypes

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -685,9 +685,9 @@ namespace DocFileFormat
 
 					if ( _bContentWrite )
 					{
-                        m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
-                            m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
-                        m_pXmlWriter->WriteNodeEnd( L"", true );
+						m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
+							m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
+						m_pXmlWriter->WriteNodeEnd( L"", true );
 
 						_fieldLevels.back().bBegin = true;
 					}
@@ -702,12 +702,12 @@ namespace DocFileFormat
 							{
 								_writeWebHidden = true;
 								std::wstring _writeTocLink =f1.substr(d + 9);
-                                d = (int)_writeTocLink.find(L" ");
+								d = (int)_writeTocLink.find(L" ");
 								_writeTocLink = _writeTocLink.substr(0, d);
 								
-                                _writeAfterRun	=	std::wstring (L"<w:hyperlink w:anchor = \"");
+								_writeAfterRun	=	std::wstring (L"<w:hyperlink w:anchor = \"");
 								_writeAfterRun +=	_writeTocLink;
-                                _writeAfterRun +=	std::wstring (L"\" w:history=\"1\">");
+								_writeAfterRun +=	std::wstring (L"\" w:history=\"1\">");
 
 								break;								
 								//cp = cpFieldSep1;
@@ -717,7 +717,28 @@ namespace DocFileFormat
 						_skipRuns = 5; //with separator
 					}
 				}
-				else if (	bEMBED  ||	bLINK ||	bQUOTE)						
+				//else if ( bHYPERLINK )
+				//{//todooo - выделение гиперссылки отдельно
+				//	std::vector<std::wstring> arRefs;
+				//	boost::algorithm::split(arRefs, f, boost::algorithm::is_any_of(L" "), boost::algorithm::token_compress_on);
+				//	
+				//	std::wstring sLink = arRefs[2];
+				//	m_pXmlWriter->WriteNodeBegin( L"w:hyperlink", true );
+
+				//	int relID = m_context->_docx->RegisterHyperlink(_caller, sLink);
+				//	m_pXmlWriter->WriteAttribute( L"r:id", L"rId"+ FormatUtils::IntToWideString( relID ) );
+				//	m_pXmlWriter->WriteAttribute( L"w:history", 1 );
+				//	m_pXmlWriter->WriteNodeEnd( L"", true, false );
+
+				//	if (arRefs.size() > 2)
+				//	{
+				//		writeTextElement(arRefs[3].substr(1, arRefs[3].length() - 2), textType);
+				//	}
+				//	m_pXmlWriter->WriteNodeEnd( L"w:hyperlink", false, true );
+
+				//	_skipRuns = 1;
+				//}
+				else if ( bEMBED ||	(bLINK && !bHYPERLINK)|| bQUOTE)						
 				{
 					int cpPic		=	searchNextTextMark(m_document->Text, cpFieldStart,	TextMark::Picture);
 					int cpFieldSep	=	searchNextTextMark(m_document->Text, cpFieldStart,	TextMark::FieldSeparator);
@@ -840,19 +861,21 @@ namespace DocFileFormat
 			else if (TextMark::FieldEndMark == code)
 			{
 				if (!_fieldLevels.empty())
-				{
-					_fieldLevels.back().bEnd = true;
-					
-					if (_fieldLevels.back().bBegin == true && !text.empty())
+				{					
+					if (!text.empty())
 					{
 						writeTextElement(text, textType);
 						text.clear();
-					}
+					}			
+					if (_fieldLevels.back().bBegin)
+					{					
+						_fieldLevels.back().bEnd = true;
 					
-                    XMLTools::XMLElement elem( L"w:fldChar" );
-                    elem.AppendAttribute( L"w:fldCharType", L"end" );
+						XMLTools::XMLElement elem( L"w:fldChar" );
+						elem.AppendAttribute( L"w:fldCharType", L"end" );
 
-					m_pXmlWriter->WriteString( elem.GetXMLString());
+						m_pXmlWriter->WriteString( elem.GetXMLString());
+					}
 
 					_fieldLevels.pop_back();
 				}
@@ -1151,20 +1174,7 @@ namespace DocFileFormat
 			if ( fc >= nMinVal )
 			{
 				ret = m_document->AllPapx->find(nMinVal)->second;
-//?				if (!ret && m_document->AllPapx->size() > 0)
-//?				{
-//?					map<int, ParagraphPropertyExceptions*>::iterator it = m_document->AllPapx->end();
-//?					it--;
-//?					do
-//?					{
-//?						if (it->first < nMinVal && it->second)
-//?							break;
-//?						it--;
-//?					}
-//?					while(it != m_document->AllPapx->begin());
-//?
-//?					ret = it->second;
-//?				}
+
 				_lastValidPapx = ret;
 			}
 		}
@@ -1215,8 +1225,8 @@ namespace DocFileFormat
 		TableInfo tai( papx, m_document->nWordVersion );
 
 		//build the table grid
-		std::vector<short> grid, grid_write;
-		buildTableGrid( cp, nestingLevel, grid, grid_write );
+		std::vector<short> grid;
+		buildTableGrid( cp, nestingLevel, grid);
 
 		//find first row end
 		int fcRowEnd = findRowEndFc( cp, nestingLevel );
@@ -1227,7 +1237,7 @@ namespace DocFileFormat
         m_pXmlWriter->WriteNodeBegin( L"w:tbl" );
 
 		//Convert it
-		TablePropertiesMapping *tpMapping = new TablePropertiesMapping( m_pXmlWriter, m_document->Styles, &grid, &grid_write );
+		TablePropertiesMapping *tpMapping = new TablePropertiesMapping( m_pXmlWriter, m_document->Styles, &grid);
 
 		row1Tapx.Convert( tpMapping );
 
@@ -1240,7 +1250,7 @@ namespace DocFileFormat
 			//only convert the cells with the given nesting level
 			while ( tai.iTap == nestingLevel )
 			{
-				cp = writeTableRow( cp, &grid, &grid_write, nestingLevel );
+				cp = writeTableRow( cp, &grid, nestingLevel );
 				//?fc = m_document->FindFileCharPos(cp );
 				fc = m_document->m_PieceTable->FileCharacterPositions->operator []( cp );
 				papx = findValidPapx( fc );
@@ -1253,7 +1263,7 @@ namespace DocFileFormat
 			//convert until the end of table is reached
 			while ( tai.fInTable )
 			{
-				cp = writeTableRow( cp, &grid, &grid_write, nestingLevel );
+				cp = writeTableRow( cp, &grid, nestingLevel );
 				fc = m_document->FindFileCharPos( cp );
 
 				papx = findValidPapx( fc );
@@ -1268,12 +1278,11 @@ namespace DocFileFormat
 	}
 
 	// Builds a list that contains the width of the several columns of the table.
-	bool DocumentMapping::buildTableGrid(int initialCp, unsigned int nestingLevel, std::vector<short>& grid, std::vector<short>& grid_write)
+	bool DocumentMapping::buildTableGrid(int initialCp, unsigned int nestingLevel, std::vector<short>& grid)
 	{
 		ParagraphPropertyExceptions* backup = _lastValidPapx;
 
-		std::vector<short> boundaries;
-		std::vector<short> boundaries_all;
+		std::map<short, short> boundaries;
 		
 		int cp = initialCp;
 		int fc = m_document->FindFileCharPos( cp );
@@ -1284,53 +1293,66 @@ namespace DocFileFormat
 		int fcRowEnd = findRowEndFc( cp, cp, nestingLevel );
 		ParagraphPropertyExceptions* papx_prev = NULL;
 
+		short max_boundary = -1;
+
+		bool fEndNestingLevel = false;
+
+		unsigned int iTap_current = 1;
+		
 		while ( tai.fInTable )
 		{
-			//check all SPRMs of this TAPX
+			iTap_current = 1;
+
 			for ( std::list<SinglePropertyModifier>::iterator iter = papx->grpprl->begin(); iter != papx->grpprl->end(); iter++ )
 			{
-				//find the tDef SPRM
 				DWORD code = iter->OpCode;
 
 				switch(iter->OpCode)
 				{
-				case sprmTDefTable:
-				case sprmOldTDefTable:
-				{
-					unsigned char itcMac = iter->Arguments[0];
-
-						while(boundaries.size() < itcMac + 1)
-							boundaries.push_back(-0x7fff);
-
-						short boundary0 = -0x7fff;
-						for (unsigned char i = 0; i < itcMac; i++)
+					case sprmPFInnerTableCell:
+					case sprmPFInnerTtp:
 					{
-						short boundary1 = FormatUtils::BytesToInt16( iter->Arguments, 1 + ( i * 2 ), iter->argumentsSize );
-							short boundary2 = FormatUtils::BytesToInt16( iter->Arguments, 1 + ( ( i + 1 ) * 2 ), iter->argumentsSize );
+						fEndNestingLevel = ( iter->Arguments[0] == 1 ) ? (true) : (false);
+					}break;
 
-							if (boundary2 - boundary1 > 1 && boundary1 - boundary0 > 1)
+					case sprmPItap:
+					{
+						iTap_current = FormatUtils::BytesToUInt32( iter->Arguments, 0, iter->argumentsSize );
+					}break;
+				}
+			}
+			if (nestingLevel == iTap_current)
+			{
+				for ( std::list<SinglePropertyModifier>::iterator iter = papx->grpprl->begin(); iter != papx->grpprl->end(); iter++ )
+				{
+					//find the tDef SPRM
+					DWORD code = iter->OpCode;
+
+					switch(iter->OpCode)
+					{
+						case sprmTDefTable:
+						case sprmOldTDefTable:
 						{
-								if ( boundaries[i] == -0x7fff || boundaries[i+1] == -0x7fff)
-								{
-									boundaries[i]	= boundary1;
-									boundaries[i+1]	= boundary2;
-								}
-							}
-							if ( find( boundaries_all.begin(), boundaries_all.end(), boundary1 ) == boundaries_all.end() )
+							unsigned char itcMac = iter->Arguments[0];
+
+							short boundary1, boundary2;
+							for (unsigned char i = 0; i < itcMac; i++)
 							{
-								boundaries_all.push_back( boundary1 );
-						}
+								boundary1 = FormatUtils::BytesToInt16( iter->Arguments + 1, i * 2 , iter->argumentsSize );
+								boundary2 = FormatUtils::BytesToInt16( iter->Arguments + 1, ( i + 1 ) * 2, iter->argumentsSize );
 
-							if ( find( boundaries_all.begin(), boundaries_all.end(), boundary2 ) == boundaries_all.end() )
-						{
-								boundaries_all.push_back( boundary2 );
-						}
-							boundary0 = boundary1;
+								AddBoundary(boundary1, boundary2, boundaries);
+							}
+							if (max_boundary < boundary2)
+								max_boundary = boundary2;
+
+							AddBoundary(boundary2, max_boundary, boundaries);
 						}break;
 					}
 				}
 			}
-
+			if (nestingLevel > 1 && fEndNestingLevel && !boundaries.empty())
+				break;
 			//get the next papx
 			papx = findValidPapx( fcRowEnd );
 			tai = TableInfo( papx, m_document->nWordVersion );
@@ -1339,23 +1361,14 @@ namespace DocFileFormat
 			if (papx_prev && papx_prev == papx )
 				break;//file(12).doc
 			papx_prev = papx;
-		}
 
-		//build the grid based on the boundaries
-		sort( boundaries_all.begin(), boundaries_all.end() );
+		}
 
 		if ( !boundaries.empty() )
 		{
-			for ( size_t i = 0; i < ( boundaries.size() - 1 ); i++ )
+			for ( std::map<short, short>::iterator it = boundaries.begin(); it != boundaries.end(); ++it)
 			{
-				grid_write.push_back(  boundaries[i + 1] - boundaries[i] );
-			}
-		}
-		if ( !boundaries_all.empty() )
-		{
-			for ( size_t i = 0; i < ( boundaries_all.size() - 1 ); i++ )
-			{
-				grid.push_back( boundaries_all[i + 1] - boundaries_all[i] );
+				grid.push_back( it->second );
 			}
 		}
 		_lastValidPapx = backup;
@@ -1363,6 +1376,40 @@ namespace DocFileFormat
 		return true;
 	}
 
+	void DocumentMapping::AddBoundary(short boundary1, short boundary2, std::map<short, short> &boundaries)
+	{
+		if (boundary2 - boundary1 < 3)
+			return;
+
+		std::map<short, short>::iterator pFind = boundaries.find(boundary1);
+
+		while(true)
+		{
+			if (pFind == boundaries.end())
+			{
+				boundaries.insert(std::make_pair(boundary1, boundary2 - boundary1));
+				break;
+			}
+			else if (pFind->second != boundary2 - boundary1)
+			{
+				if (pFind->second > boundary2 - boundary1)
+				{
+					short new_size = boundary2 - boundary1;
+					boundary1 = boundary2;
+					boundary2 = pFind->second + pFind->first;
+					pFind->second = new_size;
+				}
+				else
+				{
+					boundary1 = pFind->second + pFind->first;
+				}
+				pFind = boundaries.find(boundary1);
+			}
+			else
+				break;
+		}
+	}
+
 	// Finds the FC of the next row end mark.
 	int DocumentMapping::findRowEndFc(int initialCp, int& rowEndCp, unsigned int nestingLevel )
 	{
@@ -1480,7 +1527,7 @@ namespace DocFileFormat
 	}
 
 	/// Writes the table row that starts at the given cp value and ends at the next row end mark
-	int DocumentMapping::writeTableRow(int initialCp, std::vector<short>* grid, std::vector<short>* grid_write, unsigned int nestingLevel)
+	int DocumentMapping::writeTableRow(int initialCp, std::vector<short>* grid, unsigned int nestingLevel)
 	{
 		int cp = initialCp;
 		int fc = m_document->FindFileCharPos( cp );
@@ -1510,7 +1557,7 @@ namespace DocFileFormat
 			//Write until the first "inner trailer paragraph" is reached
 			while ( !( ( m_document->Text->at( cp ) == TextMark::ParagraphEnd ) && ( tai.fInnerTtp ) ) && tai.fInTable )
 			{
-				cp = writeTableCell( cp, &tapx, grid, grid_write, gridIndex, cellIndex, nestingLevel );
+				cp = writeTableCell( cp, &tapx, grid, gridIndex, cellIndex, nestingLevel );
 				cellIndex++;
 
 				//each cell has it's own PAPX
@@ -1527,7 +1574,7 @@ namespace DocFileFormat
 			while ( !( ( m_document->Text->at( cp ) == TextMark::CellOrRowMark ) && ( tai.fTtp ) ) 
 				&& tai.fInTable )
 			{
-				cp = writeTableCell( cp, &tapx, grid, grid_write, gridIndex, cellIndex, nestingLevel );
+				cp = writeTableCell( cp, &tapx, grid, gridIndex, cellIndex, nestingLevel );
 				cellIndex++;
 
 				//each cell has it's own PAPX
@@ -1550,15 +1597,13 @@ namespace DocFileFormat
 	}
 
 	/// Writes the table cell that starts at the given cp value and ends at the next cell end mark
-	int DocumentMapping::writeTableCell(int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, std::vector<short>* grid_write, int& gridIndex, int cellIndex, unsigned int nestingLevel )  
+	int DocumentMapping::writeTableCell(int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel )  
 	{
 		int cp = initialCp;
 		int cpCellEnd	= findCellEndCp( initialCp, nestingLevel );
 
-		//start w:tc
-        m_pXmlWriter->WriteNodeBegin( L"w:tc" );
-
-		TableCellPropertiesMapping* tcpMapping = new TableCellPropertiesMapping( m_pXmlWriter, grid, grid_write, gridIndex, cellIndex );
+		XMLTools::CStringXmlWriter writerTcPr;
+		TableCellPropertiesMapping* tcpMapping = new TableCellPropertiesMapping( &writerTcPr, grid, gridIndex, cellIndex, nestingLevel );
 
 		if ( tapx != NULL )
 		{
@@ -1567,8 +1612,19 @@ namespace DocFileFormat
 
 		gridIndex = gridIndex + tcpMapping->GetGridSpan();
 
+		bool bCoverCell = tcpMapping->IsCoverCell();
+
 		RELEASEOBJECT( tcpMapping );
 
+		if (bCoverCell)
+		{
+			return cpCellEnd;
+		}
+
+		//start w:tc
+        m_pXmlWriter->WriteNodeBegin( L"w:tc" );
+		m_pXmlWriter->WriteString(writerTcPr.GetXmlString());
+
 		//write the paragraphs of the cell
 		while ( cp < cpCellEnd )
 		{

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -110,15 +110,15 @@ namespace DocFileFormat
 	// Writes the table starts at the given cp value
 		int writeTable		( int initialCp, unsigned int nestingLevel );
 	// Builds a list that contains the width of the several columns of the table.
-		bool buildTableGrid( int initialCp, unsigned int nestingLevel, std::vector<short>& grid, std::vector<short>& grid_write );
+		bool buildTableGrid( int initialCp, unsigned int nestingLevel, std::vector<short>& grid);
 	// Finds the FC of the next row end mark.
 		int findRowEndFc		( int initialCp, int& rowEndCp, unsigned int nestingLevel );
 	// Finds the FC of the next row end mark.
 		int findRowEndFc		( int initialCp, unsigned int nestingLevel );
 	// Writes the table row that starts at the given cp value and ends at the next row end mark
-		int writeTableRow		( int initialCp, std::vector<short>* grid, std::vector<short>* grid_write, unsigned int nestingLevel );
+		int writeTableRow		( int initialCp, std::vector<short>* grid, unsigned int nestingLevel );
 	// Writes the table cell that starts at the given cp value and ends at the next cell end mark
-		int writeTableCell		( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, std::vector<short>* grid_write, int& gridIndex, int cellIndex, unsigned int nestingLevel );
+		int writeTableCell		( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel );
 		int findCellEndCp		( int initialCp, unsigned int nestingLevel );
 		
 		bool writeBookmarks		( int cp );
@@ -135,6 +135,8 @@ namespace DocFileFormat
 	// Searches the given vector for the next FieldEnd character.
 		int searchNextTextMark( std::vector<wchar_t>* chars, int initialCp, wchar_t mark );
 		Symbol	getSymbol ( const CharacterPropertyExceptions* chpx );
+
+		void AddBoundary(short boundary1, short boundary2, std::map<short, short> &boundaries);
 //----------------------------------------------------------------------------------------------------------------------
 		bool							m_bInternalXmlWriter; 
 

ASCOfficeDocFile/DocDocxConverter/FormattedDiskPagePAPX.cpp

@@ -128,21 +128,22 @@ namespace DocFileFormat
 			if ( bx.wordOffset != 0 )
 			{
 				unsigned char padbyte = 0;
-				unsigned char cw = bytes[bx.wordOffset * 2] * 2;
+				unsigned char cw = bytes[bx.wordOffset * 2];
 				//if that unsigned char is zero, it's a pad unsigned char, and the word count is the following unsigned char
 				if ( cw == 0 )
 				{
 					padbyte = 1;
-					cw = bytes[bx.wordOffset * 2 + 1] * 2;
+					cw = bytes[bx.wordOffset * 2 + 1];
 				}
 				if ( cw != 0 )
 				{
+					int sz = cw * 2;
 					//read the bytes for papx
-					unsigned char* papx = new unsigned char[cw];
-					memcpy( papx, ( bytes + (bx.wordOffset * 2) + padbyte + 1 ), cw );
+					unsigned char* papx = new unsigned char[sz];
+					memcpy( papx, ( bytes + (bx.wordOffset * 2) + padbyte + 1 ), sz );
 
 					//parse PAPX and fill grppapx
-					grppapx[i] = new ParagraphPropertyExceptions( papx, cw, dataStream, nWordVersion );
+					grppapx[i] = new ParagraphPropertyExceptions( papx, sz, dataStream, nWordVersion );
 
 					RELEASEARRAYOBJECTS( papx );
 				}

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -473,7 +473,10 @@ namespace DocFileFormat
 
         return AddPart( mapping, L"word", fileName, VMLPictureMapping::GetContentType( blipType ), OpenXmlRelationshipTypes::Image );
 	}
-
+	int OpenXmlPackage::RegisterHyperlink(const IMapping* mapping, const std::wstring& link)
+	{
+        return AddPart(mapping, L"", link, L"", OpenXmlRelationshipTypes::Hyperlink, L"External");
+	}
 	int OpenXmlPackage::RegisterOLEObject(const IMapping* mapping, const std::wstring& objectType)
 	{
         std::wstring fileName = ( std::wstring( L"embeddings/oleObject" ) + FormatUtils::IntToWideString( ++_oleCounter ) + OleObjectMapping::GetTargetExt(objectType));

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h

@@ -177,6 +177,7 @@ namespace DocFileFormat
 		int RegisterEndnotes();
 		int RegisterComments();
 		int RegisterImage			( const IMapping* mapping, Global::BlipType blipType );
+		int RegisterHyperlink		( const IMapping* mapping, const std::wstring& link);
 		int RegisterOLEObject		( const IMapping* mapping, const std::wstring& objectType );
 		int RegisterPackage			( const IMapping* mapping, const std::wstring& objectType);
 		int RegisterExternalOLEObject( const IMapping* mapping, const std::wstring& objectType, const std::wstring& uri );

ASCOfficeDocFile/DocDocxConverter/PropertyExceptions.cpp

@@ -60,7 +60,7 @@ namespace DocFileFormat
 	}
 	void PropertyExceptions::ReadExceptions(unsigned char* bytes, int size, int nWordVersion)
 	{
-		RELEASEOBJECT( grpprl );
+ 		RELEASEOBJECT( grpprl );
 
 		grpprl = new std::list<SinglePropertyModifier>();
 

ASCOfficeDocFile/DocDocxConverter/SprmTDefTable.h

@@ -177,8 +177,6 @@ namespace DocFileFormat
 			}
 		}
 
-	private: 
-
 		unsigned char numberOfColumns;
 		
 		/// An array of 16-bit signed integer that specifies horizontal distance in twips.

ASCOfficeDocFile/DocDocxConverter/StyleSheetMapping.cpp

@@ -171,7 +171,7 @@ namespace DocFileFormat
 				if ( (*iter)->tapx != NULL )
 				{
 					std::vector<short> tableGrid;
-					TablePropertiesMapping* tpMapping = new TablePropertiesMapping (m_pXmlWriter, sheet, &tableGrid, NULL, false);
+					TablePropertiesMapping* tpMapping = new TablePropertiesMapping (m_pXmlWriter, sheet, &tableGrid, false);
 					(*iter)->tapx->Convert( tpMapping );
 					RELEASEOBJECT( tpMapping );
 				}

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp

@@ -35,9 +35,11 @@
 
 namespace DocFileFormat
 {
-	TableCellPropertiesMapping::TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* grid, const std::vector<short>* grid_write, int gridIndex, int cellIndex) : 
+	TableCellPropertiesMapping::TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, 
+		const std::vector<short>* grid, int gridIndex, int cellIndex, unsigned int depth) : 
 										PropertiesMapping(pWriter)
 	{
+		_depth		=	depth;
 		_width		=	0;
 
 		_gridIndex	=	gridIndex;
@@ -75,9 +77,25 @@ namespace DocFileFormat
 		TablePropertyExceptions* tapx	=	static_cast<TablePropertyExceptions*>(visited);
 		int nComputedCellWidth			=	0;
 
-		_gridSpan = 1;
+		_gridSpan = 0;
+		_bCoverCell = false;
 
+		unsigned int iTap_current = 1;
+
+		for ( std::list<SinglePropertyModifier>::iterator iter = tapx->grpprl->begin(); iter != tapx->grpprl->end(); iter++ )
+		{
+			DWORD code = iter->OpCode;
+
+			switch(iter->OpCode)
+			{
+				case sprmPItap:
+				{
+					iTap_current = FormatUtils::BytesToUInt32( iter->Arguments, 0, iter->argumentsSize );
+				}break;
+			}
+		}
 		std::list<SinglePropertyModifier>::const_reverse_iterator rend = tapx->grpprl->rend();
+
 		for (std::list<SinglePropertyModifier>::const_reverse_iterator iter = tapx->grpprl->rbegin(); iter != rend; ++iter)
 		{
 			switch (iter->OpCode)
@@ -113,16 +131,39 @@ namespace DocFileFormat
 					{
                         appendValueElement( _tcPr, L"noWrap", L"", true );
 					}
-					int ind = (std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1);
-					int ind1 = ind; 
-					while (ind1 < tdef.rgdxaCenter.size() - 1)
+					//int ind = (std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1);
+					//int ind1 = ind; 
+					//while (ind1 < tdef.rgdxaCenter.size() - 1)
+					//{
+					//	int sz = tdef.rgdxaCenter[ ind1 + 1] - tdef.rgdxaCenter[ ind1 ] ;
+					//	if (sz > 1)
+					//		break;
+					//	ind1++;
+					//}
+
+					if (tdef.rgTc80[_cellIndex].horzMerge == 1)
 					{
-						int sz = tdef.rgdxaCenter[ ind1 + 1] - tdef.rgdxaCenter[ ind1 ] ;
-						if (sz > 1)
-							break;
-						ind1++;
+						for (size_t i = _cellIndex; i < tdef.rgTc80.size(); i++)
+						{
+							if (tdef.rgTc80[i].horzMerge < 1)
+								break;
+						
+							nComputedCellWidth += tdef.rgdxaCenter[ i + 1] - tdef.rgdxaCenter[ i ] ;
+							_gridSpan++;
+						}
+					}
+					else if (tdef.rgTc80[_cellIndex].horzMerge == 2)
+					{//skip cover cell
+						_gridSpan = 1;
+						nComputedCellWidth = 0;
+						_bCoverCell = true;
+
+					}
+					else
+					{
+						_gridSpan = 1;
+						nComputedCellWidth += tdef.rgdxaCenter[ _cellIndex + 1] - tdef.rgdxaCenter[ _cellIndex ] ;
 					}
-					nComputedCellWidth = tdef.rgdxaCenter[ ind1 + 1] - tdef.rgdxaCenter[ ind ] ;	
 
 					if (!IsTableBordersDefined(tapx->grpprl))
 					{
@@ -141,6 +182,10 @@ namespace DocFileFormat
 				}
 				break;
 
+				case sprmTDxaCol:
+				{
+				}break;
+
 				case sprmTCellPadding:
 				{
 					unsigned char first		=	iter->Arguments[0];
@@ -288,23 +333,24 @@ namespace DocFileFormat
 		_tcPr->AppendChild( tcW );
 
 
-		if ( ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidth > _grid->at( _gridIndex ) ) )
+		//if ( ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidth > _grid->at( _gridIndex ) ) )
+		//{
+		//	//check the number of merged cells
+		//	int w = _grid->at( _gridIndex );
+
+		//	for ( size_t i = _gridIndex + 1; i < _grid->size(); i++ )
+		//	{
+		//		_gridSpan++;
+
+		//		w += _grid->at( i );
+
+		//		if ( w >= nComputedCellWidth )
+		//		{
+		//			break;
+		//		}
+		//	}
+		if (_gridSpan > 1)
 		{
-			//check the number of merged cells
-			int w = _grid->at( _gridIndex );
-
-			for ( size_t i = _gridIndex + 1; i < _grid->size(); i++ )
-			{
-				_gridSpan++;
-
-				w += _grid->at( i );
-
-				if ( w >= nComputedCellWidth )
-				{
-					break;
-				}
-			}
-
             appendValueElement( _tcPr, L"gridSpan", FormatUtils::IntToWideString( _gridSpan ), true );
 		}
 

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.h

@@ -58,7 +58,7 @@ namespace DocFileFormat
 	public:	
 
 		virtual ~TableCellPropertiesMapping();
-		TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* grid, const std::vector<short>* grid_write, int gridIndex, int cellIndex);
+		TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* grid, int gridIndex, int cellIndex, unsigned int depth);
 		virtual void Apply( IVisitable* visited );
 	
 		inline int GetGridSpan() const
@@ -66,6 +66,11 @@ namespace DocFileFormat
 			return _gridSpan;
 		}
 
+		inline bool IsCoverCell() const
+		{
+			return _bCoverCell;
+		}
+
 	private:
 
 		void apppendCellShading (unsigned char* sprmArg, int size, int cellIndex);
@@ -79,12 +84,13 @@ namespace DocFileFormat
         XMLTools::XMLElement* _tcMar;
         XMLTools::XMLElement* _tcBorders;
 		
-		const std::vector<short>* _grid;
-		std::vector<short>		_tGrid;
+		const std::vector<short>*	_grid;
+		std::vector<short>			_tGrid;
 
-		short _width;
-		Global::CellWidthType _ftsWidth;
-		TC80 _tcDef;
+		short					_width;
+		Global::CellWidthType	_ftsWidth;
+		TC80					_tcDef;
+		unsigned int			_depth;
 
 		BorderCode* _brcTop;
 		BorderCode* _brcLeft;
@@ -92,5 +98,6 @@ namespace DocFileFormat
 		BorderCode* _brcBottom;
 
 		int		_gridSpan;
+		bool	_bCoverCell;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/TableMapping.cpp

@@ -106,7 +106,7 @@ namespace DocFileFormat
 		cellElements.clear();
 	}
 
-	void TableCell::Convert(IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, const std::vector<short>* grid_write, int& gridIndex, int nCellIndex)
+	void TableCell::Convert(IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, int& gridIndex, int nCellIndex)
 	{
 		if (NULL != mapping)
 		{
@@ -118,12 +118,10 @@ namespace DocFileFormat
 
 	//find cell end
 		int cpCellEnd = documentMapping->findCellEndCp(cp, depth);
-
-	//start w:tc
-		documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tc" );
 		
 	//convert the properties
-		TableCellPropertiesMapping tcpMapping(documentMapping->GetXMLWriter(), grid, grid_write, gridIndex, nCellIndex);
+		XMLTools::CStringXmlWriter writerTcPr;
+		TableCellPropertiesMapping tcpMapping(&writerTcPr, grid, gridIndex, nCellIndex, depth);
 
 		if ( tapx != NULL )
 		{
@@ -131,6 +129,15 @@ namespace DocFileFormat
 		}
 
 		gridIndex += tcpMapping.GetGridSpan();
+		
+		if (tcpMapping.IsCoverCell())
+		{
+			return;
+		}		
+	//start w:tc
+		documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tc" );
+		
+		documentMapping->GetXMLWriter()->WriteString(writerTcPr.GetXmlString());
 
 		documentMapping->_lastValidPapx = papxBackup;
 		documentMapping->_lastValidSepx = sepxBackup;
@@ -193,7 +200,7 @@ namespace DocFileFormat
 		cells.clear();
 	}
 
-	void TableRow::Convert(IMapping* mapping, const std::vector<short>* grid, const std::vector<short>* grid_write)
+	void TableRow::Convert(IMapping* mapping, const std::vector<short>* grid)
 	{
 		if ( mapping != NULL )
 		{
@@ -234,7 +241,7 @@ namespace DocFileFormat
 			{
 				for ( std::list<TableCell>::iterator iter = cells.begin(); iter != cells.end(); iter++ )
 				{
-					iter->Convert( mapping, &tapx, grid, grid_write, gridIndex, nCellIndex++);
+					iter->Convert( mapping, &tapx, grid, gridIndex, nCellIndex++);
 				}
 			}
 
@@ -516,8 +523,8 @@ namespace DocFileFormat
 		SectionPropertyExceptions* sepxBackup	=	documentMapping->_lastValidSepx;
 
 		//build the table grid
-		std::vector<short> grid, grid_write;
-		documentMapping->buildTableGrid( cpStart, depth, grid, grid_write );
+		std::vector<short> grid;
+		documentMapping->buildTableGrid( cpStart, depth, grid);
 
 		//find first row end
 		int fcRowEnd = documentMapping->findRowEndFc( cpStart, depth );
@@ -530,7 +537,7 @@ namespace DocFileFormat
         documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tbl" );
 
 		//Convert it
-		TablePropertiesMapping tpMapping( documentMapping->GetXMLWriter(), documentMapping->m_document->Styles, &grid, &grid_write );
+		TablePropertiesMapping tpMapping( documentMapping->GetXMLWriter(), documentMapping->m_document->Styles, &grid);
 
 		row1Tapx.Convert( &tpMapping );
 
@@ -539,7 +546,7 @@ namespace DocFileFormat
 
 		for ( std::list<TableRow>::iterator iter = rows.begin(); iter != rows.end(); iter++ )
 		{
-			iter->Convert( mapping, &grid, &grid_write );  
+			iter->Convert( mapping, &grid );  
 		}
 
 		//close w:tbl

ASCOfficeDocFile/DocDocxConverter/TableMapping.h

@@ -58,7 +58,7 @@ namespace DocFileFormat
 		void AddItem( const ITableCellElement& _tableCellElement );
 		bool IsEmpty() const;
 		void Clear();
-		void Convert( IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, const std::vector<short>* grid_write, int& gridIndex, int cellIndex );
+		void Convert( IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, int& gridIndex, int cellIndex );
 		~TableCell();
 
 	private:
@@ -81,7 +81,7 @@ namespace DocFileFormat
 		void AddCell( const TableCell& _tableCell );
 		bool IsEmpty() const;
 		void Clear();
-		void Convert( IMapping* mapping, const std::vector<short>* grid, const std::vector<short>* grid_write );
+		void Convert( IMapping* mapping, const std::vector<short>* grid);
 		~TableRow();
 
 	private:

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp

@@ -34,8 +34,8 @@
 
 namespace DocFileFormat
 {
-	TablePropertiesMapping::TablePropertiesMapping (XMLTools::CStringXmlWriter* pWriter, StyleSheet* styles, std::vector<short>* grid, std::vector<short>* grid_write, bool isTableStyleNeeded ):
-			PropertiesMapping(pWriter), _tblPr(NULL), _tblGrid(NULL), _tblBorders(NULL), _grid(grid), _grid_write(grid_write),
+	TablePropertiesMapping::TablePropertiesMapping (XMLTools::CStringXmlWriter* pWriter, StyleSheet* styles, std::vector<short>* grid, bool isTableStyleNeeded ):
+			PropertiesMapping(pWriter), _tblPr(NULL), _tblGrid(NULL), _tblBorders(NULL), _grid(grid),
 			brcLeft(NULL), brcTop(NULL), brcBottom(NULL), brcRight(NULL), brcHorz(NULL), brcVert(NULL), _styles(styles),
 			_isTableStyleNeeded(isTableStyleNeeded)
 {
@@ -511,7 +511,7 @@ namespace DocFileFormat
 			bWriteGridCol = true;
 		else
 		{
-			for ( size_t i = 0, nSize = _grid_write->size(); i < nSize; i++ )
+			for ( size_t i = 0, nSize = _grid->size(); i < nSize; i++ )
 			{
 				if(_grid->at(i) % DocFileFormat::gc_nZeroWidth != 0)
 				{
@@ -522,10 +522,10 @@ namespace DocFileFormat
 		}
 		if(true == bWriteGridCol)
 		{
-			for ( size_t i = 0; i < _grid_write->size(); i++ )		
+			for ( size_t i = 0; i < _grid->size(); i++ )		
 			{
                 XMLTools::XMLElement gridCol( L"w:gridCol");
-                XMLTools::XMLAttribute gridColW( L"w:w", FormatUtils::IntToWideString( _grid_write->at( i ) ) );
+                XMLTools::XMLAttribute gridColW( L"w:w", FormatUtils::IntToWideString( _grid->at( i ) ) );
 				gridCol.AppendAttribute( gridColW );
 				_tblGrid->AppendChild( gridCol );
 			}

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.h

@@ -71,7 +71,7 @@ namespace DocFileFormat
 	class TablePropertiesMapping: public PropertiesMapping, public IMapping
 	{
 	public:
-		TablePropertiesMapping( XMLTools::CStringXmlWriter* writer, StyleSheet* styles, std::vector<short>* grid, std::vector<short>* grid_write, bool isTableStyleNeeded = true );
+		TablePropertiesMapping( XMLTools::CStringXmlWriter* writer, StyleSheet* styles, std::vector<short>* grid, bool isTableStyleNeeded = true );
 		virtual ~TablePropertiesMapping();
 		void Apply( IVisitable* visited );
 
@@ -83,7 +83,6 @@ namespace DocFileFormat
 		
 		StyleSheet* _styles;
 		std::vector<short>* _grid;
-		std::vector<short>* _grid_write;
 		
 		BorderCode* brcLeft;
 		BorderCode* brcTop;

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.h

@@ -39,6 +39,7 @@ namespace DocFileFormat
 	{
 		friend class Converter;
 		friend class MainDocumentMapping;
+		friend class DocumentMapping;
 		friend class CommandTableMapping;
 		friend class StyleSheetMapping;
 		friend class NumberingMapping;

ASCOfficeOdfFile/OdfFileTest/OdfFile.sln

@@ -8,8 +8,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml_wrapper", "..\win32\cpx
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatReaderLib", "..\win32\cpodf.vcproj", "{50E20601-4A8D-4AFB-8870-63828D328429}"
 	ProjectSection(ProjectDependencies) = postProject
-		{609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
 		{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
+		{609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfCommon", "..\win32\cpcommon.vcproj", "{609ED938-3CA8-4BED-B363-25096D4C4812}"
@@ -21,17 +21,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormulasConvert", "..\wi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFileReaderTest", "OdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
 	ProjectSection(ProjectDependencies) = postProject
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
 		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
-		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
-		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
-		{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
-		{50E20601-4A8D-4AFB-8870-63828D328429} = {50E20601-4A8D-4AFB-8870-63828D328429}
 		{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
+		{50E20601-4A8D-4AFB-8870-63828D328429} = {50E20601-4A8D-4AFB-8870-63828D328429}
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
+		{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
+		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
+		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
@@ -48,20 +49,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\..\DesktopEd
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
 	ProjectSection(ProjectDependencies) = postProject
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
 		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
 	ProjectSection(ProjectDependencies) = postProject
-		{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
-		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
-		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
-		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
+		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
+		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
+		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
+		{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
@@ -88,10 +89,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeUtilsLib", "..\..\Off
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\DesktopEditor\xml\build\vs2005\libxml2.vcproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeFileCrypt", "..\..\OfficeCryptReader\win32\ECMACryptReader.vcproj", "{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\..\Common\3dParty\cryptopp\cryptlib.vcproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		DLL-Import Debug|Win32 = DLL-Import Debug|Win32
+		DLL-Import Debug|x64 = DLL-Import Debug|x64
+		DLL-Import Release|Win32 = DLL-Import Release|Win32
+		DLL-Import Release|x64 = DLL-Import Release|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
@@ -100,6 +112,14 @@ Global
 		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|Win32.Build.0 = Debug|Win32
 		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|x64.ActiveCfg = Debug|x64
 		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|x64.Build.0 = Debug|x64
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Release|x64.Build.0 = Release|x64
 		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|Win32.ActiveCfg = Release|Win32
 		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|Win32.Build.0 = Release|Win32
 		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|x64.ActiveCfg = Release|x64
@@ -108,6 +128,14 @@ Global
 		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|Win32.Build.0 = Debug|Win32
 		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|x64.ActiveCfg = Debug|x64
 		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|x64.Build.0 = Debug|x64
+		{50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Release|x64.Build.0 = Release|x64
 		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|Win32.ActiveCfg = Release|Win32
 		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|Win32.Build.0 = Release|Win32
 		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|x64.ActiveCfg = Release|x64
@@ -116,6 +144,14 @@ Global
 		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.Build.0 = Debug|Win32
 		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.ActiveCfg = Debug|x64
 		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.Build.0 = Debug|x64
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|x64.Build.0 = Release|x64
 		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.ActiveCfg = Release|Win32
 		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.Build.0 = Release|Win32
 		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.ActiveCfg = Release|x64
@@ -124,6 +160,14 @@ Global
 		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.Build.0 = Debug|Win32
 		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.ActiveCfg = Debug|x64
 		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.Build.0 = Debug|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Release|x64.Build.0 = Release|x64
 		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.ActiveCfg = Release|Win32
 		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.Build.0 = Release|Win32
 		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.ActiveCfg = Release|x64
@@ -132,6 +176,14 @@ Global
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.Build.0 = Debug|Win32
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.ActiveCfg = Debug|x64
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.Build.0 = Debug|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.DLL-Import Release|x64.Build.0 = Release|x64
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.ActiveCfg = Release|Win32
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.Build.0 = Release|Win32
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.ActiveCfg = Release|x64
@@ -140,6 +192,14 @@ Global
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.Build.0 = Debug|Win32
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.ActiveCfg = Debug|x64
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.Build.0 = Debug|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Release|x64.Build.0 = Release|x64
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.ActiveCfg = Release|Win32
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.Build.0 = Release|Win32
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.ActiveCfg = Release|x64
@@ -148,6 +208,14 @@ Global
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.Build.0 = Debug|Win32
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.ActiveCfg = Debug|x64
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.Build.0 = Debug|x64
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Release|x64.Build.0 = Release|x64
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.ActiveCfg = Release|Win32
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.Build.0 = Release|Win32
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.ActiveCfg = Release|x64
@@ -156,6 +224,14 @@ Global
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|x64.Build.0 = Release|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
@@ -164,6 +240,14 @@ Global
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.Build.0 = Debug|Win32
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.ActiveCfg = Debug|x64
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.Build.0 = Debug|x64
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Release|x64.Build.0 = Release|x64
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.ActiveCfg = Release|Win32
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.Build.0 = Release|Win32
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.ActiveCfg = Release|x64
@@ -172,6 +256,14 @@ Global
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.Build.0 = Debug|Win32
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.ActiveCfg = Debug|x64
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.Build.0 = Debug|x64
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Release|x64.Build.0 = Release|x64
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.ActiveCfg = Release|Win32
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.Build.0 = Release|Win32
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.ActiveCfg = Release|x64
@@ -180,6 +272,14 @@ Global
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.Build.0 = Debug|Win32
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.ActiveCfg = Debug|x64
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.Build.0 = Debug|x64
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Release|x64.Build.0 = Release|x64
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.ActiveCfg = Release|Win32
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.Build.0 = Release|Win32
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.ActiveCfg = Release|x64
@@ -188,6 +288,14 @@ Global
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.Build.0 = Debug|Win32
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.ActiveCfg = Debug|x64
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.Build.0 = Debug|x64
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Release|x64.Build.0 = Release|x64
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.ActiveCfg = Release|Win32
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.Build.0 = Release|Win32
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.ActiveCfg = Release|x64
@@ -196,6 +304,14 @@ Global
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.Build.0 = Debug|Win32
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.ActiveCfg = Debug|x64
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.Build.0 = Debug|x64
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Release|x64.Build.0 = Release|x64
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.ActiveCfg = Release|Win32
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.Build.0 = Release|Win32
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.ActiveCfg = Release|x64
@@ -204,6 +320,14 @@ Global
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.Build.0 = Debug|Win32
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.ActiveCfg = Debug|x64
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.Build.0 = Debug|x64
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Release|x64.Build.0 = Release|x64
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.ActiveCfg = Release|Win32
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.Build.0 = Release|Win32
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.ActiveCfg = Release|x64
@@ -212,6 +336,14 @@ Global
 		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.Build.0 = Debug|Win32
 		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.ActiveCfg = Debug|x64
 		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.Build.0 = Debug|x64
+		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Release|x64.Build.0 = Release|x64
 		{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.ActiveCfg = Release|Win32
 		{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.Build.0 = Release|Win32
 		{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.ActiveCfg = Release|x64
@@ -220,6 +352,14 @@ Global
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.Build.0 = Debug|Win32
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.ActiveCfg = Debug|x64
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.Build.0 = Debug|x64
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Release|x64.Build.0 = Release|x64
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.ActiveCfg = Release|Win32
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.Build.0 = Release|Win32
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.ActiveCfg = Release|x64
@@ -228,6 +368,14 @@ Global
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.Build.0 = Debug|Win32
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.ActiveCfg = Debug|x64
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.Build.0 = Debug|x64
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Release|x64.Build.0 = Release|x64
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.ActiveCfg = Release|Win32
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.Build.0 = Release|Win32
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.ActiveCfg = Release|x64
@@ -236,6 +384,14 @@ Global
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.Build.0 = Debug|Win32
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.ActiveCfg = Debug|x64
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.Build.0 = Debug|x64
+		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Release|x64.Build.0 = Release|x64
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.ActiveCfg = Release|Win32
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.Build.0 = Release|Win32
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.ActiveCfg = Release|x64
@@ -244,6 +400,14 @@ Global
 		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|Win32.Build.0 = Debug|Win32
 		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|x64.ActiveCfg = Debug|x64
 		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|x64.Build.0 = Debug|x64
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Release|x64.Build.0 = Release|x64
 		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|Win32.ActiveCfg = Release|Win32
 		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|Win32.Build.0 = Release|Win32
 		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|x64.ActiveCfg = Release|x64
@@ -252,6 +416,14 @@ Global
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.Build.0 = Debug|Win32
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.ActiveCfg = Debug|x64
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.Build.0 = Debug|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Release|x64.Build.0 = Release|x64
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.ActiveCfg = Release|Win32
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.Build.0 = Release|Win32
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.ActiveCfg = Release|x64
@@ -260,6 +432,14 @@ Global
 		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Win32.Build.0 = Debug|Win32
 		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|x64.ActiveCfg = Debug|x64
 		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|x64.Build.0 = Debug|x64
+		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Release|x64.Build.0 = Release|x64
 		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|Win32.ActiveCfg = Release|Win32
 		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|Win32.Build.0 = Release|Win32
 		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|x64.ActiveCfg = Release|x64
@@ -268,10 +448,50 @@ Global
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|x64
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.Build.0 = Debug|x64
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Release|x64.Build.0 = Release|x64
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.ActiveCfg = Release|Win32
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.Build.0 = Release|Win32
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.ActiveCfg = Release|x64
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.Build.0 = Release|x64
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|Win32.Build.0 = Debug|Win32
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|x64.ActiveCfg = Debug|x64
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|x64.Build.0 = Debug|x64
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Release|x64.Build.0 = Release|x64
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Release|Win32.ActiveCfg = Release|Win32
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Release|Win32.Build.0 = Release|Win32
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Release|x64.ActiveCfg = Release|x64
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Release|x64.Build.0 = Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.ActiveCfg = Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.Build.0 = Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.ActiveCfg = Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.cpp

@@ -77,6 +77,7 @@ HRESULT convert_single(std::wstring srcFileName)
 	std::wstring outputDir		= NSDirectory::GetFolderPath(dstPath);
 	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
 	std::wstring srcTempPath;
+	std::wstring srcTempPath2 = NSDirectory::CreateDirectoryWithUniqueName(outputDir);
 
 	if (fileChecker.nFileType == AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT		||
 		fileChecker.nFileType == AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS	||
@@ -96,12 +97,13 @@ HRESULT convert_single(std::wstring srcFileName)
 	}
     _CP_LOG << L"[info] " << srcFileName << std::endl;
 	
-	nResult = ConvertODF2OOXml(srcTempPath, dstTempPath, L"C:\\Windows\\Fonts", false, NULL);
+	nResult = ConvertODF2OOXml(srcTempPath, dstTempPath, L"C:\\Windows\\Fonts", srcTempPath2, L"password", NULL);
 
 	if (srcTempPath != srcFileName)
 	{
 		NSDirectory::DeleteDirectory(srcTempPath);
 	}
+	NSDirectory::DeleteDirectory(srcTempPath2);
 
 	if (nResult == 0)
 	{   

ASCOfficeOdfFile/include/cpdoccore/odf/odf_document.h

@@ -57,8 +57,8 @@ class odf_read_context;
 class odf_document
 {
 public:
-    odf_document(const std::wstring & Folder, const ProgressCallback* CallBack);
-	odf_document(xml::sax * Reader);
+    odf_document(const std::wstring & SrcPath, const std::wstring & TempPath, const std::wstring& Password, const ProgressCallback* CallBack);
+	odf_document(xml::sax * Reader, const std::wstring & TempPath);
 	
 	~odf_document();
 
@@ -68,10 +68,12 @@ public:
     bool xlsx_convert(oox::xlsx_conversion_context & Context);
 	bool pptx_convert(oox::pptx_conversion_context & Context);
 	
-	const std::wstring & get_folder() const;
+	const std::wstring & get_folder()		const;
+	const std::wstring & get_temp_folder()	const;
 	
-	int get_office_mime_type();
-	bool get_encrypted();
+	int		get_office_mime_type();
+	bool	get_encrypted();
+	bool	get_error();
 
     class Impl;   
     Impl * get_impl() { return impl_.get(); }

ASCOfficeOdfFile/src/ConvertOO2OOX.cpp

@@ -83,28 +83,38 @@ int ConvertOdp2Pptx(cpdoccore::odf_reader::odf_document & inputOdf, const std::w
 
     return 0;
 }
-int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, bool bOnlyPresentation, const ProgressCallback* CallBack)
+int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack)
 {
 	int nResult = 0;
 
 	try 
     {
-		cpdoccore::odf_reader::odf_document inputOdf(srcPath, CallBack);
+		cpdoccore::odf_reader::odf_document inputOdf(srcPath, tempPath, password, CallBack);
 		
-		int type = inputOdf.get_office_mime_type();
-		bool encrypted = inputOdf.get_encrypted();
+		int type		= inputOdf.get_office_mime_type();
+		bool bEncrypted	= inputOdf.get_encrypted();
+		bool bError		= inputOdf.get_error();
 
-		if (encrypted) return AVS_ERROR_DRM;
-
-		if (bOnlyPresentation && type != 3)return AVS_ERROR_UNEXPECTED;
+		if (bError)
+		{
+			if (bEncrypted)
+			{
+				if (password.empty())	return AVS_ERROR_DRM;
+				else					return AVS_ERROR_PASSWORD;
+			}
+			else
+			{
+				return AVS_ERROR_FILEFORMAT;
+			}
+		}
 
 		switch (type)
 		{
 		case 1:
-			nResult = ConvertOdt2Docx(inputOdf,dstPath, fontsPath);
+			nResult = ConvertOdt2Docx(inputOdf, dstPath, fontsPath);
 			break;
 		case 2:
-			nResult = ConvertOds2Xlsx(inputOdf,dstPath, fontsPath);
+			nResult = ConvertOds2Xlsx(inputOdf, dstPath, fontsPath);
 			break;
 		case 3:
 			nResult = ConvertOdp2Pptx(inputOdf, dstPath, fontsPath);

ASCOfficeOdfFile/src/ConvertOO2OOX.h

@@ -35,6 +35,6 @@
 
 struct ProgressCallback;
 
-int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, bool bOnlyPresentation, const ProgressCallback* CallBack);
+int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack);
 
-int ConvertOTF2ODF(const std::wstring & dstPath);
+int ConvertOTF2ODF(const std::wstring & otfPath);

ASCOfficeOdfFile/src/odf/draw_frame.cpp

@@ -274,7 +274,7 @@ void draw_object::add_child_element( xml::sax * Reader, const std::wstring & Ns,
     if CP_CHECK_NAME(L"office", L"document")
     {
 		//embedded
-		odf_document_ = odf_document_ptr( new odf_document(Reader));
+		odf_document_ = odf_document_ptr( new odf_document(Reader, NSDirectory::GetTempPath()));
     }
 }
 

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -1461,13 +1461,14 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
 
 		if (!odf_document_ && !href.empty())
 		{			
+			std::wstring tempPath	= Context.root()->get_temp_folder();
 			std::wstring folderPath = Context.root()->get_folder();
 			std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
 
 			// normalize path ???? todooo
 			XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
 
-			odf_document_ = odf_document_ptr(new odf_document(objectPath, NULL));    
+			odf_document_ = odf_document_ptr(new odf_document(objectPath, tempPath, L"", NULL));    
 		}
 //---------------------------------------------------------------------------------------------------------------------
 		draw_frame*				frame			= NULL;

ASCOfficeOdfFile/src/odf/draw_frame_pptx.cpp

@@ -261,13 +261,14 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
 		
 		if (!odf_document_ && !href.empty())
 		{			
+			std::wstring tempPath	= Context.root()->get_temp_folder();
 			std::wstring folderPath = Context.root()->get_folder();
 			std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
 
 			// normalize path ???? todooo
 			XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
 
-			odf_document_ = odf_document_ptr(new odf_document(objectPath, NULL));    
+			odf_document_ = odf_document_ptr(new odf_document(objectPath, tempPath, L"", NULL));    
 		}
 //---------------------------------------------------------------------------------------------------------------------
 		office_element *contentSubDoc = odf_document_ ? odf_document_->get_impl()->get_content() : NULL;

ASCOfficeOdfFile/src/odf/draw_frame_xlsx.cpp

@@ -268,13 +268,14 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
 		
 		if (!odf_document_ && !href.empty())
 		{			
+			std::wstring tempPath	= Context.root()->get_temp_folder();
 			std::wstring folderPath = Context.root()->get_folder();
 			std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
 
 			// normalize path ???? todooo
 			XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
 
-			odf_document_ = odf_document_ptr(new odf_document(objectPath, NULL));    
+			odf_document_ = odf_document_ptr(new odf_document(objectPath, tempPath, L"", NULL));    
 		}
 		office_element *contentSubDoc = odf_document_ ? odf_document_->get_impl()->get_content() : NULL;
 		if (!contentSubDoc)

ASCOfficeOdfFile/src/odf/odf_document.cpp

@@ -38,9 +38,11 @@
 namespace cpdoccore { 
 namespace odf_reader {
 
-odf_document::odf_document(const std::wstring & Folder, const ProgressCallback* CallBack) : impl_(new Impl(Folder, CallBack))
+odf_document::odf_document(const std::wstring & SrcPath, const std::wstring & TempPath, const std::wstring & Password, const ProgressCallback* CallBack) 
+	: impl_(new Impl(SrcPath, TempPath, Password, CallBack))
 {}
-odf_document::odf_document( xml::sax * Reader) : impl_(new Impl(Reader))
+
+odf_document::odf_document( xml::sax * Reader, const std::wstring & TempPath) : impl_(new Impl(Reader, TempPath))
 {}
 
 odf_document::~odf_document()
@@ -70,6 +72,11 @@ const std::wstring & odf_document::get_folder() const
     return impl_->get_folder();
 }
 
+const std::wstring & odf_document::get_temp_folder() const
+{
+    return impl_->get_temp_folder();
+}
+
 int odf_document::get_office_mime_type() 
 {
 	return impl_->get_office_mime_type();
@@ -78,6 +85,10 @@ bool odf_document::get_encrypted()
 {
 	return impl_->get_encrypted();
 }
+bool odf_document::get_error() 
+{
+	return impl_->get_error();
+}
 bool odf_document::UpdateProgress(long Complete)
 {
 	if (!impl_) return true;

ASCOfficeOdfFile/src/odf/odf_document_impl.cpp

@@ -85,6 +85,8 @@
 
 #include "../progressCallback.h"
 
+#include "../../../OfficeCryptReader/source/CryptTransform.h"
+
 #define PROGRESSEVENT_ID 0
 
 namespace cpdoccore { 
@@ -119,11 +121,12 @@ content_xml_t_ptr odf_document::Impl::read_file_content(const std::wstring & Pat
 
     return result;
 }
-odf_document::Impl::Impl(xml::sax * Reader): 
-			context_(new odf_read_context()), base_folder_(L""), pCallBack(NULL), bUserStopConvert (0)
+odf_document::Impl::Impl(xml::sax * Reader, const std::wstring & tempPath): 
+			context_(new odf_read_context()), base_folder_(L""), pCallBack(NULL), bUserStopConvert (0), bError(false)
 {
 	office_mime_type_ = 0;
-	encrypted = false;
+
+	tmp_folder_original_ = tempPath;
 
 	content_xml_ = read_file_content(Reader);
 	
@@ -141,30 +144,59 @@ odf_document::Impl::Impl(xml::sax * Reader):
 		_CP_LOG << L"[info] parse settings" << std::endl;
 		parse_settings(content_xml_->get_content());
 			
-		tmp_folder_ = NSDirectory::CreateDirectoryWithUniqueName(NSDirectory::GetTempPath());
+		tmp_folder_ = NSDirectory::CreateDirectoryWithUniqueName(tempPath);
 	}
 }
 
-odf_document::Impl::Impl(const std::wstring & srcPath, const ProgressCallback* CallBack) : 
-			context_(new odf_read_context()), pCallBack(CallBack), bUserStopConvert (0)
+odf_document::Impl::Impl(const std::wstring & srcPath, const std::wstring & tempPath, const std::wstring & Password, const ProgressCallback* CallBack) : 
+			context_(new odf_read_context()), pCallBack(CallBack), bUserStopConvert (0), bError(false)
 {
 	office_mime_type_ = 0;
-	encrypted = false;
+
+	tmp_folder_original_ = tempPath;
 
 	if (NSDirectory::Exists(srcPath))
 	{
 		base_folder_ = srcPath; 
 
-		std::wstring content_xml	= srcPath + FILE_SEPARATOR_STR + L"content.xml";
-		std::wstring styles_xml		= srcPath + FILE_SEPARATOR_STR + L"styles.xml";
-		std::wstring meta_xml		= srcPath + FILE_SEPARATOR_STR + L"meta.xml";
-		std::wstring settings_xml	= srcPath + FILE_SEPARATOR_STR + L"settings.xml";
 		std::wstring manifest_xml	= srcPath + FILE_SEPARATOR_STR + L"META-INF" + FILE_SEPARATOR_STR + L"manifest.xml";
 		std::wstring mimetype_xml	= srcPath + FILE_SEPARATOR_STR + L"mimetype";
 
+		_CP_LOG << L"[info] read mimetype" << std::endl;
+		NSFile::CFileBinary::ReadAllTextUtf8(mimetype_xml, mimetype_content_file_); 
+
 		_CP_LOG << L"[info] read manifest.xml" << std::endl;
 		manifest_xml_ = read_file_content(manifest_xml);
 
+		_CP_LOG << L"[info] parse manifest" << std::endl;
+		parse_manifests(manifest_xml_ ? manifest_xml_->get_content() : NULL);
+
+		if (!office_mime_type_)
+		{
+			office_mime_type_ = GetMimetype(mimetype_content_file_);
+		}
+
+		if (false == map_encryptions_.empty())
+		{
+			if (Password.empty()) return;
+
+			//decrypt files
+			tmp_folder_ = NSDirectory::CreateDirectoryWithUniqueName(tempPath);
+
+			bError = !decrypt_folder(base_folder_, tmp_folder_);
+
+			if (bError)
+				return;
+
+			base_folder_ = tmp_folder_;
+		}
+
+		std::wstring content_xml	= base_folder_ + FILE_SEPARATOR_STR + L"content.xml";
+		std::wstring styles_xml		= base_folder_ + FILE_SEPARATOR_STR + L"styles.xml";
+		std::wstring meta_xml		= base_folder_ + FILE_SEPARATOR_STR + L"meta.xml";
+		std::wstring settings_xml	= base_folder_ + FILE_SEPARATOR_STR + L"settings.xml";
+
+//-----------------------------------------------------------------------------------------------------
 		  _CP_LOG << L"[info] read settings.xml" << std::endl;
 		settings_xml_ = read_file_content(settings_xml);
 
@@ -174,8 +206,6 @@ odf_document::Impl::Impl(const std::wstring & srcPath, const ProgressCallback* C
 		  _CP_LOG << L"[info] read styles.xml" << std::endl;
 		styles_xml_ = read_file_content(styles_xml);
 
-		_CP_LOG << L"[info] read mimetype" << std::endl;
-		NSFile::CFileBinary::ReadAllTextUtf8(mimetype_xml, mimetype_content_file_); 
 //----------------------------------------------------------------------------------------
 		_CP_LOG << L"[info] parse fonts" << std::endl;
 		parse_fonts(content_xml_ ? content_xml_->get_content() : NULL);
@@ -183,14 +213,6 @@ odf_document::Impl::Impl(const std::wstring & srcPath, const ProgressCallback* C
 		_CP_LOG << L"[info] parse styles" << std::endl;
 		parse_styles(styles_xml_ ? styles_xml_->get_content() : NULL);
 
-		_CP_LOG << L"[info] parse manifest" << std::endl;
-		parse_manifests(manifest_xml_ ? manifest_xml_->get_content() : NULL);
-
-		if (!office_mime_type_)
-		{
-			office_mime_type_ = GetMimetype(mimetype_content_file_);
-		}
-
 		_CP_LOG << L"[info] parse settings" << std::endl;
 		parse_settings(settings_xml_ ? settings_xml_->get_content() : NULL);
 
@@ -214,7 +236,7 @@ odf_document::Impl::Impl(const std::wstring & srcPath, const ProgressCallback* C
 			_CP_LOG << L"[info] parse settings" << std::endl;
 			parse_settings(content_xml_->get_content());
 
-			tmp_folder_ = NSDirectory::CreateDirectoryWithUniqueName(NSDirectory::GetTempPath());
+			tmp_folder_ = NSDirectory::CreateDirectoryWithUniqueName(tempPath);
 		}
 	}
 
@@ -225,11 +247,135 @@ odf_document::Impl::~Impl()
 	if (!tmp_folder_.empty())
 		NSDirectory::DeleteDirectory(tmp_folder_);
 }
+
+bool odf_document::Impl::decrypt_folder (const std::wstring & srcPath, const std::wstring & dstPath)
+{
+	std::vector<std::wstring> arFiles		= NSDirectory::GetFiles(srcPath, false);
+	std::vector<std::wstring> arDirectories	= NSDirectory::GetDirectories(srcPath);
+	
+	bool result = true;
+	for (size_t i = 0; i < arFiles.size(); ++i)
+	{
+		std::wstring sFileName = NSFile::GetFileName(arFiles[i]);
+		
+		std::map<std::wstring, std::pair<office_element_ptr, int>>::iterator pFind = map_encryptions_.find(arFiles[i]);
+		if ( pFind != map_encryptions_.end() )
+		{
+			result = decrypt_file(arFiles[i], dstPath + FILE_SEPARATOR_STR + sFileName, pFind->second.first, pFind->second.second);
+			
+			if (false == result)
+				break;
+		}
+		else
+		{
+			NSFile::CFileBinary::Copy(arFiles[i], dstPath + FILE_SEPARATOR_STR + sFileName);
+		}
+	}
+	for (size_t i = 0; result && i < arDirectories.size(); ++i)
+	{
+		std::wstring sDirName = NSFile::GetFileName(arDirectories[i]);
+		
+		NSDirectory::CreateDirectory(dstPath + FILE_SEPARATOR_STR + sDirName);
+
+		result = decrypt_folder(arDirectories[i], dstPath + FILE_SEPARATOR_STR + sDirName);
+	}
+	return result;
+}
+std::string DecodeBase64(const std::wstring & value1)
+{
+	int nLength = 0;
+	unsigned char *pData = NULL;
+	std::string result;
+
+	std::string value(value1.begin(), value1.end());
+
+	NSFile::CBase64Converter::Decode(value.c_str(), value.length(), pData, nLength);
+	if (pData)
+	{
+		result = std::string((char*)pData, nLength);
+		delete []pData; pData = NULL;
+	}
+	return result;
+}
+bool odf_document::Impl::decrypt_file (const std::wstring & srcPath, const std::wstring & dstPath, office_element_ptr data, int size )
+{
+	manifest_encryption_data* encryption_data = dynamic_cast<manifest_encryption_data*>(data.get());
+	if (!encryption_data) return false;
+
+	//std::wstring checksum_;
+	//std::wstring checksum_type_;
+
+	manifest_algorithm*				algorithm = dynamic_cast<manifest_algorithm*>(encryption_data->algorithm_.get());
+	manifest_key_derivation*		key_derivation = dynamic_cast<manifest_key_derivation*>(encryption_data->key_derivation_.get());
+	manifest_start_key_generation*	start_key_generation = dynamic_cast<manifest_start_key_generation*>(encryption_data->start_key_generation_.get());
+
+	CRYPT::ODFDecryptor		decryptor;
+	CRYPT::_odfCryptData	cryptData;
+	
+	cryptData.saltValue	= DecodeBase64(key_derivation->salt_);	
+	cryptData.saltSize = cryptData.saltValue.length(); 
+	
+	cryptData.hashSize = start_key_generation->key_size_;
+		
+	cryptData.checksumData = DecodeBase64(encryption_data->checksum_);
+	cryptData.initializationVector = DecodeBase64(algorithm->initialisation_vector_);
+	
+//------------------------------------------------------------------------------------------
+	cryptData.hashAlgorithm		= CRYPT_METHOD::SHA256; 
+	cryptData.spinCount			= key_derivation->iteration_count_;
+	cryptData.cipherAlgorithm	= CRYPT_METHOD::AES_CBC;
+	cryptData.keySize			= 256 /8;	
+
+	decryptor.SetCryptData(cryptData);
+	
+	if (!decryptor.SetPassword(L"password"))
+	{
+		return false;
+	}
+//------------------------------------------------------------------------------------------------------------
+	bool result = false;
+
+	NSFile::CFileBinary file_inp;
+	if (file_inp.OpenFile(srcPath))
+	{
+		_UINT64 lengthData, lengthRead = file_inp.GetFileSize();
+
+		unsigned char* data		= new unsigned char[lengthRead];
+		unsigned char* data_out	= NULL;
+		DWORD dwSizeRead = 0;
+		
+		int readTrue = file_inp.ReadFile(data, lengthRead, dwSizeRead); 
+		int readData = readTrue - 8; 
+
+		lengthData = *((_UINT64*)data);
+
+		decryptor.Decrypt(data + 8, readData, data_out, 0);//todoo сделать покусочное чтение декриптование
+
+		if (data_out)
+		{
+			NSFile::CFileBinary file_out;
+            file_out.CreateFileW(dstPath);
+			file_out.WriteFile(data_out, lengthData);
+			file_out.CloseFile();
+
+			delete []data_out;
+			result = true;
+		}
+		
+		delete []data;
+	}
+	return result;
+}
+const std::wstring & odf_document::Impl::get_temp_folder() const 
+{
+	return tmp_folder_original_; 
+}
 const std::wstring & odf_document::Impl::get_folder() const 
 {
 	if (!base_folder_.empty())	return base_folder_; 
 	else return tmp_folder_;
 }
+
 bool odf_document::Impl::UpdateProgress(long nComplete)
 {
 	if (pCallBack)
@@ -341,8 +487,16 @@ void odf_document::Impl::parse_manifests(office_element *element)
 
 		manifest_entry * entry = dynamic_cast<manifest_entry *>(elm.get());
 		if (!entry)continue;
+		
+		if (entry->encryption_data_)
+		{
+			std::wstring file_path = entry->full_path_;
 
-		if (entry->full_path_ == L"content.xml" && entry->encryption_) encrypted = true;
+			XmlUtils::replace_all( file_path, L"/", FILE_SEPARATOR_STR);
+			file_path = base_folder_ + FILE_SEPARATOR_STR + file_path;
+
+			map_encryptions_.insert(std::make_pair(file_path, std::make_pair(entry->encryption_data_, entry->size)));
+		}
 
 		if (entry->full_path_ == L"/")
 		{

ASCOfficeOdfFile/src/odf/odf_document_impl.h

@@ -58,8 +58,9 @@ typedef shared_ptr<content_xml_t>::Type content_xml_t_ptr;
 class odf_document::Impl
 {
 public:
-    Impl(const std::wstring & Folder, const ProgressCallback* CallBack);
-	Impl(xml::sax * Reader);
+    Impl(const std::wstring & SrcPath, const std::wstring & TempPath, const std::wstring & Password, const ProgressCallback* CallBack);
+	
+	Impl(xml::sax * Reader, const std::wstring & TempPath);
 	virtual ~Impl();
 
     odf_read_context & odf_context();
@@ -72,19 +73,22 @@ public:
     bool pptx_convert(oox::pptx_conversion_context & Context);
 
     const std::wstring & get_folder() const;
+    const std::wstring & get_temp_folder() const;
    
 	const office_element * get_content() const;
 		  office_element * get_content();
 
 	int get_office_mime_type() {return office_mime_type_;}
 
-	bool get_encrypted(){return encrypted;}
+	bool get_encrypted() {return (false == map_encryptions_.empty());}
+	bool get_error() {return bError;}
 
 	bool UpdateProgress(long Complete);
     
 private:
 	const ProgressCallback* pCallBack;
 	short bUserStopConvert;
+	bool bError;
    
 	odf_read_context_ptr context_;
     
@@ -93,6 +97,9 @@ private:
 	void parse_manifests(office_element *element);
     void parse_settings	(office_element *element);
 
+	bool decrypt_folder (const std::wstring & srcPath, const std::wstring & dstPath);
+	bool decrypt_file (const std::wstring & srcPath, const std::wstring & dstPath, office_element_ptr data, int size );
+
     content_xml_t_ptr content_xml_;
     content_xml_t_ptr styles_xml_;
     content_xml_t_ptr meta_xml_;
@@ -103,11 +110,13 @@ private:
 
     std::wstring base_folder_;
     std::wstring tmp_folder_;
+    std::wstring tmp_folder_original_;
 
 	int office_mime_type_;
-	bool encrypted;
 
 	int GetMimetype(std::wstring value);
+
+	std::map<std::wstring, std::pair<office_element_ptr, int>> map_encryptions_;
             
 };
 

ASCOfficeOdfFile/src/odf/office_document.cpp

@@ -128,34 +128,83 @@ const wchar_t * office_document_settings::name = L"document-settings";
 
 // manifest:manifest
 //////////////////////////////////////////////////////////////////////////////////////////////////
-const wchar_t * manifest_manifest::ns = L"manifest";
+const wchar_t * manifest_manifest::ns	= L"manifest";
 const wchar_t * manifest_manifest::name = L"manifest";
 
 // manifest:file-entry
 //////////////////////////////////////////////////////////////////////////////////////////////////
-const wchar_t * manifest_entry::ns = L"manifest";
-const wchar_t * manifest_entry::name = L"file-entry";
+const wchar_t * manifest_entry::ns		= L"manifest";
+const wchar_t * manifest_entry::name	= L"file-entry";
 
 void manifest_entry::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
     CP_APPLY_ATTR(L"manifest:media-type", media_type_, std::wstring(L""));
     CP_APPLY_ATTR(L"manifest:full-path", full_path_, std::wstring(L""));
+	CP_APPLY_ATTR(L"manifest:size",	size, 0);
 }
 void manifest_entry::add_child_element(cpdoccore::xml::sax *Reader, const std::wstring &Ns, const std::wstring &Name)
 {
 	if CP_CHECK_NAME(L"manifest", L"encryption-data")
-        CP_CREATE_ELEMENT(encryption_);
+	{
+        CP_CREATE_ELEMENT(encryption_data_);
+	}
 }
-// manifest:file-entry
+// manifest:encryption-data
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * manifest_encryption_data::ns = L"manifest";
 const wchar_t * manifest_encryption_data::name = L"encryption-data";
 
 void manifest_encryption_data::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    CP_APPLY_ATTR(L"manifest:checksum", manifest_checksum_, std::wstring(L""));
-    CP_APPLY_ATTR(L"manifest:checksum-type", manifest_checksum_type_, std::wstring(L""));
+    CP_APPLY_ATTR(L"manifest:checksum", checksum_, std::wstring(L""));
+    CP_APPLY_ATTR(L"manifest:checksum-type", checksum_type_, std::wstring(L""));
+}
+void manifest_encryption_data::add_child_element(cpdoccore::xml::sax *Reader, const std::wstring &Ns, const std::wstring &Name)
+{
+	if CP_CHECK_NAME(L"manifest", L"algorithm")
+	{
+        CP_CREATE_ELEMENT(algorithm_);
+	}
+	else if CP_CHECK_NAME(L"manifest", L"key-derivation")
+	{
+        CP_CREATE_ELEMENT(key_derivation_);
+	}
+	else if CP_CHECK_NAME(L"manifest", L"start-key-generation")
+	{
+        CP_CREATE_ELEMENT(start_key_generation_);
+	}
+}
+// manifest:algorithm
+//////////////////////////////////////////////////////////////////////////////////////////////////
+const wchar_t * manifest_algorithm::ns = L"manifest";
+const wchar_t * manifest_algorithm::name = L"algorithm";
 
+void manifest_algorithm::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+    CP_APPLY_ATTR(L"manifest:algorithm-name", algorithm_name, std::wstring(L""));
+    CP_APPLY_ATTR(L"manifest:initialisation-vector", initialisation_vector_, std::wstring(L""));
+}
+// manifest:key-derivation
+//////////////////////////////////////////////////////////////////////////////////////////////////
+const wchar_t * manifest_key_derivation::ns = L"manifest";
+const wchar_t * manifest_key_derivation::name = L"key-derivation";
+
+void manifest_key_derivation::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+    CP_APPLY_ATTR(L"manifest:key-derivation-name", key_derivation_name_, std::wstring(L""));
+    CP_APPLY_ATTR(L"manifest:key-size", key_size_, 16);
+    CP_APPLY_ATTR(L"manifest:iteration-count", iteration_count_, 100000);
+    CP_APPLY_ATTR(L"manifest:salt", salt_, std::wstring(L""));
+}
+// manifest:start-key-generation
+//////////////////////////////////////////////////////////////////////////////////////////////////
+const wchar_t * manifest_start_key_generation::ns = L"manifest";
+const wchar_t * manifest_start_key_generation::name = L"start-key-generation";
+
+void manifest_start_key_generation::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+    CP_APPLY_ATTR(L"manifest:start-key-generation-name", start_key_generation_name_, std::wstring(L""));
+    CP_APPLY_ATTR(L"manifest:key-size", key_size_, 20);
 }
 }
 }

ASCOfficeOdfFile/src/odf/office_document.h

@@ -200,21 +200,21 @@ public:
 
     CPDOCCORE_DEFINE_VISITABLE();
 
-	std::wstring media_type_;
-	std::wstring full_path_;
+	std::wstring		media_type_;
+	std::wstring		full_path_;
+	int					size;
 
-	office_element_ptr encryption_;
+	office_element_ptr	encryption_data_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(manifest_entry);
 
-
 // manifest:encryption-data
 class manifest_encryption_data  : public office_element
 {
 public:
 	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
-	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
+	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 	virtual void add_text(const std::wstring & Text){}
 
 	static const wchar_t * ns;
@@ -226,15 +226,83 @@ public:
 
     CPDOCCORE_DEFINE_VISITABLE();
 
-	std::wstring manifest_checksum_;
-	std::wstring manifest_checksum_type_;
+	std::wstring checksum_;
+	std::wstring checksum_type_;
 
-	//childs
-	//manifest:algorithm
-	//manifest:key-derivation 
+	office_element_ptr algorithm_;
+	office_element_ptr key_derivation_;
+	office_element_ptr start_key_generation_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(manifest_encryption_data);
 
+// manifest:algorithm
+class manifest_algorithm  : public office_element
+{
+public:
+	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
+	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
+	virtual void add_text(const std::wstring & Text){}
+
+	static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeManifestAlgorithm;
+
+    CPDOCCORE_OFFICE_DOCUMENT_IMPL_NAME_FUNCS_;
+
+    CPDOCCORE_DEFINE_VISITABLE();
+
+	std::wstring algorithm_name;
+	std::wstring initialisation_vector_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(manifest_algorithm);
+
+// manifest:key_derivation
+class manifest_key_derivation  : public office_element
+{
+public:
+	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
+	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
+	virtual void add_text(const std::wstring & Text){}
+
+	static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeManifestKeyDerivation;
+
+    CPDOCCORE_OFFICE_DOCUMENT_IMPL_NAME_FUNCS_;
+
+    CPDOCCORE_DEFINE_VISITABLE();
+
+	std::wstring	key_derivation_name_;
+	int				key_size_;
+	int				iteration_count_;
+	std::wstring	salt_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(manifest_key_derivation);
+
+// manifest:start-key-generation
+class manifest_start_key_generation  : public office_element
+{
+public:
+	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
+	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
+	virtual void add_text(const std::wstring & Text){}
+
+	static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeManifestStartKeyGeneration;
+
+    CPDOCCORE_OFFICE_DOCUMENT_IMPL_NAME_FUNCS_;
+
+    CPDOCCORE_DEFINE_VISITABLE();
+
+	std::wstring	start_key_generation_name_;
+	int				key_size_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(manifest_start_key_generation);
+
 }
 }

ASCOfficeOdfFile/src/odf/office_elements_type.h

@@ -358,6 +358,10 @@ enum ElementType
 	typeManifestEntry,
 	typeManifestEncryptionData,
 
+	typeManifestAlgorithm,
+	typeManifestStartKeyGeneration,
+	typeManifestKeyDerivation,
+
 	typeOfficeSettings,
 	typeOfficeSettingsConfigItemSet,
 	typeOfficeSettingsConfigItem,

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -1267,11 +1267,58 @@ void DocxConverter::convert(OOX::Logic::CParagraphProperty	*oox_paragraph_pr, cp
 	}
 	if (oox_paragraph_pr->m_oShd.IsInit())
 	{
-		_CP_OPT(odf_types::color) odf_color;
-		convert(oox_paragraph_pr->m_oShd->m_oFill.GetPointer(), oox_paragraph_pr->m_oShd->m_oThemeFill.GetPointer(),
-			oox_paragraph_pr->m_oShd->m_oThemeFillTint.GetPointer(), oox_paragraph_pr->m_oShd->m_oThemeShade.GetPointer(), odf_color);
-		if (odf_color)
-			paragraph_properties->content_.fo_background_color_ = *odf_color;
+		int type_shading = 100; //solid
+		if (oox_paragraph_pr->m_oShd->m_oVal.IsInit())
+		{
+            switch(oox_paragraph_pr->m_oShd->m_oVal->GetValue())
+			{
+			case SimpleTypes::shdClear                 : type_shading = 0;	break;
+			case SimpleTypes::shdNil                   : type_shading = 0;	break;
+			case SimpleTypes::shdPct10                 : type_shading = 10;	break;;
+			case SimpleTypes::shdPct12                 : type_shading = 12;	break;
+			case SimpleTypes::shdPct15                 : type_shading = 15;	break;
+			case SimpleTypes::shdPct20                 : type_shading = 20;	break;
+			case SimpleTypes::shdPct25                 : type_shading = 25;	break;
+			case SimpleTypes::shdPct30                 : type_shading = 30;	break;
+			case SimpleTypes::shdPct35                 : type_shading = 35;	break;
+			case SimpleTypes::shdPct37                 : type_shading = 37;	break;
+			case SimpleTypes::shdPct40                 : type_shading = 40;	break;
+			case SimpleTypes::shdPct45                 : type_shading = 45;	break;
+			case SimpleTypes::shdPct5                  : type_shading = 5;	break;
+			case SimpleTypes::shdPct55                 : type_shading = 55;	break;
+			case SimpleTypes::shdPct60                 : type_shading = 60;	break;
+			case SimpleTypes::shdPct62                 : type_shading = 62;	break;
+			case SimpleTypes::shdPct65                 : type_shading = 65;	break;
+			case SimpleTypes::shdPct70                 : type_shading = 70;	break;
+			case SimpleTypes::shdPct75                 : type_shading = 75;	break;
+			case SimpleTypes::shdPct80                 : type_shading = 80;	break;
+			case SimpleTypes::shdPct85                 : type_shading = 85;	break;
+			case SimpleTypes::shdPct87                 : type_shading = 87;	break;
+			case SimpleTypes::shdPct90                 : type_shading = 90;	break;
+			case SimpleTypes::shdPct95                 : type_shading = 95;	break;
+			case SimpleTypes::shdSolid                 : type_shading = 100;break;
+			//case SimpleTypes::shdDiagCross             : type_shading = 2;	break;
+			//case SimpleTypes::shdDiagStripe            : type_shading = 3;	break;
+			//case SimpleTypes::shdHorzCross             : type_shading = 4;	break;
+			//case SimpleTypes::shdHorzStripe            : type_shading = 6;	break;
+			//case SimpleTypes::shdReverseDiagStripe     : type_shading = 7;	break;
+			//case SimpleTypes::shdThinDiagCross         : type_shading = 8;	break;
+			//case SimpleTypes::shdThinDiagStripe        : type_shading = 9;	break;
+			//case SimpleTypes::shdThinHorzCross         : type_shading = 10;	break;
+			//case SimpleTypes::shdThinHorzStripe        : type_shading = 11;	break;
+			//case SimpleTypes::shdThinReverseDiagStripe : type_shading = 12;	break;
+			//case SimpleTypes::shdThinVertStripe        : type_shading = 13;	break;
+			//case SimpleTypes::shdVertStripe            : type_shading = 14;	break;
+			}
+		}
+		if (type_shading != 0)
+		{
+			_CP_OPT(odf_types::color) odf_color;
+			convert(oox_paragraph_pr->m_oShd->m_oFill.GetPointer(), oox_paragraph_pr->m_oShd->m_oThemeFill.GetPointer(),
+				oox_paragraph_pr->m_oShd->m_oThemeFillTint.GetPointer(), oox_paragraph_pr->m_oShd->m_oThemeShade.GetPointer(), odf_color);
+			if (odf_color)
+				paragraph_properties->content_.fo_background_color_ = *odf_color;
+		}
 	}
 	if (oox_paragraph_pr->m_oTextDirection.IsInit() && oox_paragraph_pr->m_oTextDirection->m_oVal.IsInit())
 	{

Common/3dParty/icu/fetch.sh

@@ -16,11 +16,13 @@ case "$os" in
     platform="linux"
     BUILD_PLATFORM=Linux
     SHARED_LIB_EXT=.so.$SHARED_LIB_VER
+    SHARED_LIB_SHORT_EXT=.so.$ICU_MAJOR_VER
     ;;
   Darwin*)
     platform="mac"
     BUILD_PLATFORM=MacOSX
     SHARED_LIB_EXT=.$SHARED_LIB_VER.dylib
+    SHARED_LIB_SHORT_EXT=.$ICU_MAJOR_VER.dylib
     ;;
   *)        exit ;;
 esac
@@ -73,5 +75,5 @@ fi
 
 cd ../../
 
-cp "./icu/source/lib/libicudata$SHARED_LIB_EXT" "build/libicudata$SHARED_LIB_EXT"
-cp "./icu/source/lib/libicuuc$SHARED_LIB_EXT" "build/libicuuc$SHARED_LIB_EXT"
+cp "./icu/source/lib/libicudata$SHARED_LIB_EXT" "build/libicudata$SHARED_LIB_SHORT_EXT"
+cp "./icu/source/lib/libicuuc$SHARED_LIB_EXT" "build/libicuuc$SHARED_LIB_SHORT_EXT"

Common/3dParty/icu/icu.pri

@@ -14,13 +14,13 @@ core_win_32 {
 core_linux {
     INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/usr/local/include
 
-    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.so.60.2
-    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.so.60.2
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.so.60
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.so.60
 }
 
 core_mac {
     INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/usr/local/include
 
-    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.60.2.dylib
-    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.60.2.dylib
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.60.dylib
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.60.dylib
 }

Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro

@@ -211,6 +211,7 @@ HEADERS += docxformatlib.h \
     ../Source/XlsxFormat/Table/Autofilter.h \
     ../Source/XlsxFormat/Table/Table.h \
     ../Source/XlsxFormat/Workbook/BookViews.h \
+	../Source/XlsxFormat/Workbook/CalcPr.h \
     ../Source/XlsxFormat/Workbook/DefinedNames.h \
     ../Source/XlsxFormat/Workbook/Sheets.h \
     ../Source/XlsxFormat/Workbook/Workbook.h \

Common/DocxFormat/Source/DocxFormat/WritingElement.h

@@ -1004,6 +1004,7 @@ namespace OOX
 		et_x_Borders, // <borders>
 		et_x_Border,
 		et_x_BorderProp,
+		et_x_CalcPr, // <calcPr>
 		et_x_CellStyles,
 		et_x_CellStyle,
 		et_x_CellStyleXfs,

Common/DocxFormat/Source/XlsxFormat/SimpleTypes_Spreadsheet.h

@@ -2674,5 +2674,80 @@ namespace SimpleTypes
 			SimpleType_FromString     (EDdeValueType)
 			SimpleType_Operator_Equal (CDdeValueType)
 		};
+
+		enum ECalcMode
+		{
+			calcmodeAuto			=  0,
+			calcmodeAutoNoTable	=  1,
+			calcmodeManual		=  2,
+		};
+
+		template<ECalcMode eDefValue = calcmodeAuto>
+		class CCalcMode : public CSimpleType<ECalcMode, eDefValue>
+		{
+		public:
+			CCalcMode() {}
+
+			virtual ECalcMode FromString(std::wstring &sValue)
+			{
+				if      ( _T("auto")      == sValue ) this->m_eValue = calcmodeAuto;
+				else if ( _T("autoNoTable")  == sValue ) this->m_eValue = calcmodeAutoNoTable;
+				else if ( _T("manual")     == sValue ) this->m_eValue = calcmodeManual;
+				else                                    this->m_eValue = eDefValue;
+
+				return this->m_eValue;
+			}
+
+			virtual std::wstring       ToString  () const
+			{
+				switch(this->m_eValue)
+				{
+				case calcmodeAuto : return _T("auto");break;
+				case calcmodeAutoNoTable : return _T("autoNoTable");break;
+				case calcmodeManual : return _T("manual");break;
+				default : return _T("auto");
+
+				}
+			}
+
+			SimpleType_FromString     (ECalcMode)
+			SimpleType_Operator_Equal (CCalcMode)
+		};
+
+		enum ERefMode
+		{
+			refmodeA1	=  0,
+			refmodeR1C1	=  1
+		};
+
+		template<ERefMode eDefValue = refmodeA1>
+		class CRefMode : public CSimpleType<ERefMode, eDefValue>
+		{
+		public:
+			CRefMode() {}
+
+			virtual ERefMode FromString(std::wstring &sValue)
+			{
+				if      ( _T("A1")    == sValue ) this->m_eValue = refmodeA1;
+				else if ( _T("R1C1")  == sValue ) this->m_eValue = refmodeR1C1;
+				else                              this->m_eValue = eDefValue;
+
+				return this->m_eValue;
+			}
+
+			virtual std::wstring       ToString  () const
+			{
+				switch(this->m_eValue)
+				{
+				case refmodeA1 : return _T("A1");break;
+				case refmodeR1C1 : return _T("R1C1");break;
+				default : return _T("A1");
+
+				}
+			}
+
+			SimpleType_FromString     (ERefMode)
+			SimpleType_Operator_Equal (CRefMode)
+		};
 	};// Spreadsheet
 } // SimpleTypes

Common/DocxFormat/Source/XlsxFormat/Workbook/CalcPr.h

@@ -0,0 +1,134 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2018
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+#ifndef OOX_CALCPR_FILE_INCLUDE_H_
+#define OOX_CALCPR_FILE_INCLUDE_H_
+
+#include "../CommonInclude.h"
+
+
+namespace OOX
+{
+	namespace Spreadsheet
+	{
+    class CCalcPr : public WritingElement
+    {
+    public:
+        WritingElement_AdditionConstructors(CCalcPr)
+            CCalcPr()
+			{
+			}
+            virtual ~CCalcPr()
+			{
+			}
+			virtual void fromXML(XmlUtils::CXmlNode& node)
+			{
+			}
+			virtual std::wstring toXML() const
+			{
+				return _T("");
+			}
+			virtual void toXML(NSStringUtils::CStringBuilder& writer) const
+			{
+				writer.WriteString(_T("<calcPr"));
+				WritingStringNullableAttrInt(L"calcId", m_oCalcId, m_oCalcId->GetValue());
+				WritingStringNullableAttrString(L"calcMode", m_oCalcMode, m_oCalcMode->ToString());
+				WritingStringNullableAttrBool(L"fullCalcOnLoad", m_oFullCalcOnLoad);
+				WritingStringNullableAttrString(L"refMode", m_oRefMode, m_oRefMode->ToString());
+				WritingStringNullableAttrBool(L"iterate", m_oIterate);
+				WritingStringNullableAttrInt(L"iterateCount", m_oIterateCount, m_oIterateCount->GetValue());
+				WritingStringNullableAttrDouble(L"iterateDelta", m_oIterateDelta, m_oIterateDelta->GetValue());
+				WritingStringNullableAttrBool(L"fullPrecision", m_oFullPrecision);
+				WritingStringNullableAttrBool(L"calcCompleted", m_oCalcCompleted);
+				WritingStringNullableAttrBool(L"calcOnSave", m_oCalcOnSave);
+				WritingStringNullableAttrBool(L"concurrentCalc", m_oConcurrentCalc);
+				WritingStringNullableAttrInt(L"concurrentManualCount", m_oConcurrentManualCount, m_oConcurrentManualCount->GetValue());
+				WritingStringNullableAttrBool(L"forceFullCalc", m_oForceFullCalc);
+				writer.WriteString(_T("/>"));
+			}
+			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
+			{
+				ReadAttributes( oReader );
+
+				if ( !oReader.IsEmptyNode() )
+					oReader.ReadTillEnd();
+			}
+
+			virtual EElementType getType () const
+			{
+				return et_x_CalcPr;
+			}
+
+		private:
+
+			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
+			{
+				// Читаем атрибуты
+				WritingElement_ReadAttributes_Start( oReader )
+
+				WritingElement_ReadAttributes_Read_if		( oReader, _T("calcId"),				m_oCalcId )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("calcMode"),				m_oCalcMode )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("fullCalcOnLoad"),		m_oFullCalcOnLoad )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("refMode"),				m_oRefMode )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("iterate"),				m_oIterate )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("iterateCount"),			m_oIterateCount )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("iterateDelta"),			m_oIterateDelta )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("fullPrecision"),			m_oFullPrecision )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("calcCompleted"),			m_oCalcCompleted )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("calcOnSave"),			m_oCalcOnSave )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("concurrentCalc"),		m_oConcurrentCalc )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("concurrentManualCount"), m_oConcurrentManualCount )
+				WritingElement_ReadAttributes_Read_else_if	( oReader, _T("forceFullCalc"),			m_oForceFullCalc )
+
+				WritingElement_ReadAttributes_End( oReader )
+			}
+
+		public:
+			nullable<SimpleTypes::CUnsignedDecimalNumber<>>		m_oCalcId;
+			nullable<SimpleTypes::Spreadsheet::CCalcMode<>>		m_oCalcMode;
+			nullable<SimpleTypes::COnOff<>>						m_oFullCalcOnLoad;
+			nullable<SimpleTypes::Spreadsheet::CRefMode<>>		m_oRefMode;
+			nullable<SimpleTypes::COnOff<>>						m_oIterate;
+			nullable<SimpleTypes::CUnsignedDecimalNumber<>>		m_oIterateCount;
+			nullable<SimpleTypes::CDouble>						m_oIterateDelta;
+			nullable<SimpleTypes::COnOff<>>						m_oFullPrecision;
+			nullable<SimpleTypes::COnOff<>>						m_oCalcCompleted;
+			nullable<SimpleTypes::COnOff<>>						m_oCalcOnSave;
+			nullable<SimpleTypes::COnOff<>>						m_oConcurrentCalc;
+			nullable<SimpleTypes::CUnsignedDecimalNumber<>>		m_oConcurrentManualCount;
+			nullable<SimpleTypes::COnOff<>>						m_oForceFullCalc;
+		};
+
+	} //Spreadsheet
+} // namespace OOX
+
+#endif // OOX_CALCPR_FILE_INCLUDE_H_

Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h

@@ -37,6 +37,7 @@
 #include "../CommonInclude.h"
 
 #include "BookViews.h"
+#include "CalcPr.h"
 #include "DefinedNames.h"
 #include "Sheets.h"
 #include "WorkbookPr.h"
@@ -47,7 +48,6 @@ namespace OOX
 	namespace Spreadsheet
 	{
 		//необработанные child:
-		//<calcPr>
 		//<customWorkbookViews>
 		//<extLst>
 		//<fileRecoveryPr>
@@ -129,6 +129,8 @@ namespace OOX
 
 							if ( _T("bookViews") == sName )
 								m_oBookViews = oReader;
+							else if ( _T("calcPr") == sName )
+								m_oCalcPr = oReader;
 							else if ( _T("definedNames") == sName )
 								m_oDefinedNames = oReader;
 							else if ( _T("sheets") == sName )
@@ -156,8 +158,9 @@ namespace OOX
 					m_oExternalReferences->toXML(sXml);
 				if(m_oDefinedNames.IsInit())
 					m_oDefinedNames->toXML(sXml);
+				if(m_oCalcPr.IsInit())
+					m_oCalcPr->toXML(sXml);
 
-				sXml.WriteString(_T("<calcPr calcId=\"145621\"/>"));
 				if(m_oPivotCachesXml.IsInit())
 					sXml.WriteString(m_oPivotCachesXml.get());
 				sXml.WriteString(_T("</workbook>"));
@@ -236,6 +239,7 @@ namespace OOX
 			nullable<OOX::Spreadsheet::CWorkbookPr>			m_oWorkbookPr;
 			nullable<OOX::Spreadsheet::CExternalReferences>	m_oExternalReferences;
 			nullable<std::wstring>							m_oPivotCachesXml;
+            nullable<OOX::Spreadsheet::CCalcPr>				m_oCalcPr;
 			
 			bool											m_bMacroEnabled;
 		};

OfficeCryptReader/source/CryptTransform.cpp

@@ -439,7 +439,7 @@ bool DecryptCipher(_buf & key, _buf & iv, _buf & data_inp, _buf & data_out,  CRY
 //------------------------------------------------------------------------------------------------------------------------------------
 namespace CRYPT
 {
-
+//-----------------------------------------------------------------------------------------------------------
 ECMADecryptor::ECMADecryptor()
 {
 	bVerify = false;
@@ -631,7 +631,7 @@ bool ECMADecryptor::CheckDataIntegrity(unsigned char* data, int  size)
 		
 	return (hmac == expected);
 }
-	
+
 void ECMADecryptor::Decrypt(unsigned char* data_inp, int  size, unsigned char*& data_out, unsigned long start_iv_block)
 {
 	data_out = new unsigned char[size];
@@ -907,8 +907,93 @@ int ECMAEncryptor::Encrypt(unsigned char* data_inp_ptr, int size, unsigned char*
 
 	return enc_size + 8;
 }
+//-----------------------------------------------------------------------------------------------------------
+ODFDecryptor::ODFDecryptor()
+{
+	bVerify = false;
+}
 
+ODFDecryptor::~ODFDecryptor()
+{
+}
 
+bool ODFDecryptor::SetPassword(std::wstring _password)
+{
+//	bVerify		= false;
+//	password	= _password;
+//
+//	if (password.empty()) return false;
+//	
+//	_buf pPassword		(password);
+//	_buf pSalt			(cryptData.saltValue);
+//	_buf empty			(NULL, 0, false);
+//
+//	_buf pEncVerInput	(cryptData.encryptedVerifierInput);
+//	_buf pEncVerValue	(cryptData.encryptedVerifierValue);
+//	
+//	_buf verifierKey = GenerateHashKey(pSalt, pPassword, cryptData.hashSize, cryptData.spinCount, cryptData.hashAlgorithm);		
+//	CorrectHashSize(verifierKey, cryptData.keySize, 0);
+//	if (cryptData.keySize == 5)
+//		CorrectHashSize(verifierKey, 16, 0); //40-bit crypt key !!!
+//
+//	if (cryptData.cipherAlgorithm == CRYPT_METHOD::RC4)
+//	{
+//		rc4Decryption.SetKey(verifierKey.ptr, verifierKey.size);
+//	}
+////--------------------------------------------
+//	_buf decryptedVerifierHashInputBytes;		
+//	DecryptCipher(verifierKey, pSalt, pEncVerInput, decryptedVerifierHashInputBytes, cryptData.cipherAlgorithm);
+//
+////--------------------------------------------
+//	_buf hashBuf = HashAppend(decryptedVerifierHashInputBytes, empty, cryptData.hashAlgorithm);
+////--------------------------------------------
+//	
+//	_buf decryptedVerifierHashBytes;		
+//	DecryptCipher(verifierKey, pSalt, pEncVerValue, decryptedVerifierHashBytes, cryptData.cipherAlgorithm);
+//
+//	bVerify	= (decryptedVerifierHashBytes==hashBuf);
+
+	return bVerify;
+}
+
+bool ODFDecryptor::IsVerify()
+{
+	return bVerify;
+}
+
+void ODFDecryptor::SetCryptData(_odfCryptData	& data)
+{
+	cryptData = data;
+}
+void ODFDecryptor::Decrypt(char* data, const size_t size, const unsigned long start_iv_block)
+{
+	if (!bVerify) return;
+	
+	unsigned char* data_out = NULL;
+	Decrypt((unsigned char*)data, size, data_out, start_iv_block);
+	
+	if (data_out)
+	{
+		memcpy(data, data_out, size);
+		delete []data_out;
+	}
+}
+void ODFDecryptor::Decrypt(unsigned char* data_inp, int  size, unsigned char*& data_out, unsigned long start_iv_block)
+{
+	data_out = new unsigned char[size];
+	
+	_buf pPassword	(password);
+	_buf pSalt		(cryptData.saltValue);
+	_buf empty		(NULL, 0, false);
+
+	_buf hashKey = GenerateHashKey(pSalt, pPassword, cryptData.hashSize, cryptData.spinCount, cryptData.hashAlgorithm, start_iv_block);
+	CorrectHashSize(hashKey, cryptData.keySize, 0);
+	
+	_buf pInp(data_inp, size, false);
+	_buf pOut(data_out, size, false);
+
+	DecryptCipher(hashKey, empty, pInp, pOut, cryptData.cipherAlgorithm);
+}
 
 
 }

OfficeCryptReader/source/CryptTransform.h

@@ -104,8 +104,22 @@ struct _ecmaCryptData
 //..........
 
 	bool fDocProps = true;
-
 };
+struct _odfCryptData
+{
+	CRYPT_METHOD::_cipherAlgorithm	cipherAlgorithm = CRYPT_METHOD::AES_CBC;
+	CRYPT_METHOD::_hashAlgorithm	hashAlgorithm = CRYPT_METHOD::SHA1;
+
+	int			spinCount	= 100000;
+	int			keySize		= 0x10;
+	int			hashSize	= 0x14;
+	int			saltSize	= 0x10;
+
+	std::string saltValue;
+	std::string initializationVector;
+	std::string checksumData;
+};
+//---------------------------------------------------------------------------------------------------
 class ECMAEncryptor 
 {
 public:
@@ -153,4 +167,29 @@ private:
 	bool			bVerify;
 };
 
+class ODFDecryptor : public Decryptor
+{
+public:
+	ODFDecryptor();
+	virtual ~ODFDecryptor();
+
+	virtual void Init(const unsigned long val) {}
+	
+	virtual void Decrypt (char* data, const size_t size, const unsigned long stream_pos, const size_t block_size){}
+	virtual void Decrypt (char* data, const size_t size, const unsigned long start_iv_block);
+	
+	virtual bool SetPassword (std::wstring password);
+	virtual bool IsVerify();
+
+	void SetCryptData(_odfCryptData &data);
+	
+	void Decrypt (unsigned char* data, int  size, unsigned char*& data_out, unsigned long start_iv_block);
+
+private:
+
+	std::wstring	password;
+	_odfCryptData	cryptData;
+	bool			bVerify;
+};
+
 }

X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.h

@@ -43,10 +43,10 @@
 
 @property (strong) NSString* password;
 @property (assign) BOOL isNoBase64;
-@property (strong) NSString* delimiter;
+@property (strong) NSNumber* delimiter;
 @property (assign) NSNumber* encoding;
 
-+ (NSArray *)delimiters;
++ (NSArray <NSString *> *)delimiters;
 + (NSArray <Encoding *> *)encodingings;
 
 - (int)sdk_docx2doct_bin:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath;

X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.mm

@@ -273,13 +273,13 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
     oInputParams.m_sFontDir = new std::wstring(nsstring_to_wstring(nsFontPath));
     oInputParams.m_bIsNoBase64 = new bool(self.isNoBase64);
     
-    if (self.delimiter != nil && self.delimiter.length > 0) {
-        oInputParams.m_sCsvDelimiterChar = new std::wstring(nsstring_to_wstring(self.delimiter));
+    if (self.delimiter != nil) {
+        oInputParams.m_nCsvDelimiter = new int(self.delimiter.intValue);
     }
-    if (self.encoding) {
+    if (self.encoding != nil) {
         oInputParams.m_nCsvTxtEncoding = new int(self.encoding.intValue);
     }
- 
+    
     oInputParams.m_nFormatFrom = new int(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV);
     oInputParams.m_nFormatTo = new int(AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET);
     
@@ -325,7 +325,7 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
     return NExtractTools::zip2dir(from, to);
 }
 
-+ (NSArray *)delimiters {
++ (NSArray <NSString *> *)delimiters {
     NSMutableArray *values = [[NSMutableArray alloc]init];
     
     [values addObject:[NSString stringWithFormat:@"\t"]];

X2tConverter/src/ASCConverters.cpp

@@ -2302,7 +2302,7 @@ namespace NExtractTools
 
        NSDirectory::CreateDirectory(sTempUnpackedOox);
 
-		int nRes = ConvertODF2OOXml(sTempUnpackedOdf, sTempUnpackedOox, params.getFontPath(), false, NULL);
+	   int nRes = ConvertODF2OOXml(sTempUnpackedOdf, sTempUnpackedOox, params.getFontPath(), sTemp, params.getPassword(), NULL);
 		if(SUCCEEDED_X2T(nRes))
 		{
            BinDocxRW::CDocxSerializer m_oCDocxSerializer;
@@ -2353,7 +2353,7 @@ namespace NExtractTools
        if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedOdf, NULL, 0))
            return AVS_FILEUTILS_ERROR_CONVERT;;
 
-		return ConvertODF2OOXml(sTempUnpackedOdf, sTo, params.getFontPath(), false, NULL);
+		return ConvertODF2OOXml(sTempUnpackedOdf, sTo, params.getFontPath(), sTemp, params.getPassword(), NULL);
 	}
 	//odf flat
 	int odf_flat2oot(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
@@ -2380,7 +2380,7 @@ namespace NExtractTools
 
        NSDirectory::CreateDirectory(sTempUnpackedOox);
 
-		int nRes = ConvertODF2OOXml(sFrom, sTempUnpackedOox, params.getFontPath(), false, NULL);
+		int nRes = ConvertODF2OOXml(sFrom, sTempUnpackedOox, params.getFontPath(), sTemp, params.getPassword(), NULL);
 		if(SUCCEEDED_X2T(nRes))
 		{
            BinDocxRW::CDocxSerializer m_oCDocxSerializer;
@@ -2407,7 +2407,7 @@ namespace NExtractTools
 	}
 	int odf_flat2oox_dir(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
 	{
-       return ConvertODF2OOXml(sFrom, sTo, params.getFontPath(), false, NULL);
+		return ConvertODF2OOXml(sFrom, sTo, params.getFontPath(), sTemp, params.getPassword(), NULL);
 	}
 	// docx -> odt
 	int docx2odt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params )

XlsxSerializerCom/Common/BinReaderWriterDefines.h

@@ -194,7 +194,8 @@ namespace BinXlsxRW
 		DdeLink = 11,
 		VbaProject = 12,
 		JsaProject = 13,
-		Comments = 14
+		Comments = 14,
+		CalcPr = 15
 	};}
 	namespace c_oSerWorkbookVbaProjectTypes{enum c_oSerWorkbookVbaProjectTypes
 	{
@@ -219,6 +220,22 @@ namespace BinXlsxRW
         Hidden = 3,
 		Comment = 4
 	};}
+	namespace c_oSerCalcPrTypes{enum c_oSerCalcPrTypes
+	{
+		CalcId = 0,
+		CalcMode = 1,
+		FullCalcOnLoad = 2,
+		RefMode = 3,
+		Iterate = 4,
+		IterateCount = 5,
+		IterateDelta = 6,
+		FullPrecision = 7,
+		CalcCompleted = 8,
+		CalcOnSave = 9,
+		ConcurrentCalc = 10,
+		ConcurrentManualCount = 11,
+		ForceFullCalc = 12
+	};}
 	namespace c_oSerWorksheetsTypes{enum c_oSerWorksheetsTypes
 	{
 		Worksheet = 0,

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -1519,6 +1519,12 @@ namespace BinXlsxRW
 				WriteDefinedNames(workbook.m_oDefinedNames.get());
 				m_oBcw.WriteItemWithLengthEnd(nCurPos);
 			}
+			if (workbook.m_oCalcPr.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerWorkbookTypes::CalcPr);
+				WriteCalcPr(workbook.m_oCalcPr.get());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
 	//ExternalReferences
 			if(workbook.m_oExternalReferences.IsInit())
 			{
@@ -1626,6 +1632,88 @@ namespace BinXlsxRW
 				m_oBcw.WriteItemWithLengthEnd(nCurPos);
 			}
         }
+        void WriteCalcPr(const OOX::Spreadsheet::CCalcPr& CCalcPr)
+		{
+			int nCurPos = 0;
+			if(CCalcPr.m_oCalcId.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::CalcId);
+				m_oBcw.m_oStream.WriteULONG(CCalcPr.m_oCalcId->GetValue());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oCalcMode.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::CalcMode);
+				m_oBcw.m_oStream.WriteBYTE((BYTE)CCalcPr.m_oCalcMode->GetValue());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oFullCalcOnLoad.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::FullCalcOnLoad);
+				m_oBcw.m_oStream.WriteBOOL(CCalcPr.m_oFullCalcOnLoad->ToBool());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oRefMode.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::RefMode);
+				m_oBcw.m_oStream.WriteBYTE((BYTE)CCalcPr.m_oRefMode->GetValue());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oIterate.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::Iterate);
+				m_oBcw.m_oStream.WriteBOOL(CCalcPr.m_oIterate->ToBool());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oIterateCount.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::IterateCount);
+				m_oBcw.m_oStream.WriteULONG(CCalcPr.m_oIterateCount->GetValue());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oIterateDelta.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::IterateDelta);
+				m_oBcw.m_oStream.WriteDoubleReal(CCalcPr.m_oIterateDelta->GetValue());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oFullPrecision.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::FullPrecision);
+				m_oBcw.m_oStream.WriteBOOL(CCalcPr.m_oFullPrecision->ToBool());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oCalcCompleted.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::CalcCompleted);
+				m_oBcw.m_oStream.WriteBOOL(CCalcPr.m_oCalcCompleted->ToBool());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oCalcOnSave.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::CalcOnSave);
+				m_oBcw.m_oStream.WriteBOOL(CCalcPr.m_oCalcOnSave->ToBool());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oConcurrentCalc.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::ConcurrentCalc);
+				m_oBcw.m_oStream.WriteBOOL(CCalcPr.m_oConcurrentCalc->ToBool());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oConcurrentManualCount.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::ConcurrentManualCount);
+				m_oBcw.m_oStream.WriteULONG(CCalcPr.m_oConcurrentManualCount->GetValue());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+			if(CCalcPr.m_oForceFullCalc.IsInit())
+			{
+				nCurPos = m_oBcw.WriteItemStart(c_oSerCalcPrTypes::ForceFullCalc);
+				m_oBcw.m_oStream.WriteBOOL(CCalcPr.m_oForceFullCalc->ToBool());
+				m_oBcw.WriteItemWithLengthEnd(nCurPos);
+			}
+		}
 		void WriteExternalReferences(const OOX::Spreadsheet::CExternalReferences& externalReferences, OOX::Spreadsheet::CWorkbook& workbook)
 		{
 			int nCurPos;

XlsxSerializerCom/Writer/BinaryReader.h

@@ -1556,6 +1556,11 @@ namespace BinXlsxRW
 				m_oWorkbook.m_oDefinedNames.Init();
 				res = Read1(length, &BinaryWorkbookTableReader::ReadDefinedNames, this, poResult);
 			}
+			else if(c_oSerWorkbookTypes::CalcPr == type)
+			{
+				m_oWorkbook.m_oCalcPr.Init();
+				res = Read1(length, &BinaryWorkbookTableReader::ReadCalcPr, this, m_oWorkbook.m_oCalcPr.GetPointer());
+			}
 			else if(c_oSerWorkbookTypes::ExternalReferences == type)
 			{
 				m_oWorkbook.m_oExternalReferences.Init();
@@ -1778,6 +1783,79 @@ namespace BinXlsxRW
 				res = c_oSerConstants::ReadUnknown;
 			return res;
         }
+		int ReadCalcPr(BYTE type, long length, void* poResult)
+		{
+			int res = c_oSerConstants::ReadOk;
+            OOX::Spreadsheet::CCalcPr* calcPr = static_cast<OOX::Spreadsheet::CCalcPr*>(poResult);
+			if(c_oSerCalcPrTypes::CalcId == type)
+			{
+				calcPr->m_oCalcId.Init();
+				calcPr->m_oCalcId->SetValue(m_oBufferedStream.GetULong());
+			}
+			else if(c_oSerCalcPrTypes::CalcMode == type)
+			{
+				calcPr->m_oCalcMode.Init();
+				calcPr->m_oCalcMode->SetValue((SimpleTypes::Spreadsheet::ECalcMode)m_oBufferedStream.GetUChar());
+			}
+			else if(c_oSerCalcPrTypes::FullCalcOnLoad == type)
+			{
+				calcPr->m_oFullCalcOnLoad.Init();
+				calcPr->m_oFullCalcOnLoad->FromBool(m_oBufferedStream.GetBool());
+			}
+			else if(c_oSerCalcPrTypes::RefMode == type)
+			{
+				calcPr->m_oRefMode.Init();
+				calcPr->m_oRefMode->SetValue((SimpleTypes::Spreadsheet::ERefMode)m_oBufferedStream.GetUChar());
+			}
+			else if(c_oSerCalcPrTypes::Iterate == type)
+			{
+				calcPr->m_oIterate.Init();
+				calcPr->m_oIterate->FromBool(m_oBufferedStream.GetBool());
+			}
+			else if(c_oSerCalcPrTypes::IterateCount == type)
+			{
+				calcPr->m_oIterateCount.Init();
+				calcPr->m_oIterateCount->SetValue(m_oBufferedStream.GetULong());
+			}
+			else if(c_oSerCalcPrTypes::IterateDelta == type)
+			{
+				calcPr->m_oIterateDelta.Init();
+				calcPr->m_oIterateDelta->SetValue(m_oBufferedStream.GetDoubleReal());
+			}
+			else if(c_oSerCalcPrTypes::FullPrecision == type)
+			{
+				calcPr->m_oFullPrecision.Init();
+				calcPr->m_oFullPrecision->FromBool(m_oBufferedStream.GetBool());
+			}
+			else if(c_oSerCalcPrTypes::CalcCompleted == type)
+			{
+				calcPr->m_oCalcCompleted.Init();
+				calcPr->m_oCalcCompleted->FromBool(m_oBufferedStream.GetBool());
+			}
+			else if(c_oSerCalcPrTypes::CalcOnSave == type)
+			{
+				calcPr->m_oCalcOnSave.Init();
+				calcPr->m_oCalcOnSave->FromBool(m_oBufferedStream.GetBool());
+			}
+			else if(c_oSerCalcPrTypes::ConcurrentCalc == type)
+			{
+				calcPr->m_oConcurrentCalc.Init();
+				calcPr->m_oConcurrentCalc->FromBool(m_oBufferedStream.GetBool());
+			}
+			else if(c_oSerCalcPrTypes::ConcurrentManualCount == type)
+			{
+				calcPr->m_oConcurrentManualCount.Init();
+				calcPr->m_oConcurrentManualCount->SetValue(m_oBufferedStream.GetULong());
+			}
+			else if(c_oSerCalcPrTypes::ForceFullCalc == type)
+			{
+				calcPr->m_oForceFullCalc.Init();
+				calcPr->m_oForceFullCalc->FromBool(m_oBufferedStream.GetBool());
+			}
+			else
+				res = c_oSerConstants::ReadUnknown;
+			return res;
+		}
 		int ReadExternalBook(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExternalLink* extLink = static_cast<OOX::Spreadsheet::CExternalLink*>(poResult);