From 2005efd645dac4bf64d800df77eb90403b76511e Mon Sep 17 00:00:00 2001
From: "Elen.Subbotina" <Elen.Subbotina@onlyoffice.com>
Date: Tue, 12 Jan 2016 10:25:16 +0000
Subject: [PATCH] DocFormat - bug 31338

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@67372 954022d7-b5bf-4e40-9824-e11837661b57
---
 ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp   | 5 ++++-
 ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
index d99e8a6ca2..3784960185 100644
--- a/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
@@ -571,7 +571,10 @@ namespace DocFileFormat
 							m_pXmlWriter->WriteNodeEnd( _T( "w:object" ) );	
 						}
 
-						this->_skipRuns = 5;
+						if (search(f.begin(), f.end(), embed.begin(), embed.end()) != f.end() )
+							this->_skipRuns = 3;
+						else
+							this->_skipRuns = 5;
 					}
 					else
 					{
diff --git a/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj b/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
index e192a0ce7f..1d711e621c 100644
--- a/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
+++ b/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
@@ -107,8 +107,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;_LIB;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_"
+				AdditionalIncludeDirectories="C:\_WORK\trunk\ServerComponents\Common\DocxFormat\Source\XML\libxml2\XML\include"
+				PreprocessorDefinitions="_DEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"