docFormat - фикс 04012010post.doc - embed Word.8

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65210 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -475,6 +475,7 @@ namespace DocFileFormat
 					std::wstring link	( _T( " LINK" ) );
 					std::wstring form	( _T( " FORM" ) );
 					std::wstring excel	( _T( " Excel" ) );
+					std::wstring word	( _T( " Word" ) );
 					std::wstring mergeformat	( _T( " MERGEFORMAT" ) );
 
 					if ( search( f.begin(), f.end(), form.begin(), form.end() ) != f.end() )
@@ -501,7 +502,9 @@ namespace DocFileFormat
 						this->_fldCharCounter++;
 					}
 					else if ((search(f.begin(), f.end(), mergeformat.begin(), mergeformat.end()) != f.end()) ||
-						(search(f.begin(), f.end(), excel.begin(), excel.end()) != f.end()))
+							((search(f.begin(), f.end(), excel.begin(), excel.end()) != f.end() ||
+							search(f.begin(), f.end(), word.begin(), word.end()) != f.end()) && 
+							search(f.begin(), f.end(), embed.begin(), embed.end()) != f.end()))
 					{
 						int cpPic		=	searchNextTextMark(m_document->Text, cpFieldStart, TextMark::Picture);
 						int cpFieldSep	=	searchNextTextMark(m_document->Text, cpFieldStart, TextMark::FieldSeparator);