Добавлена конвертиция формул из doc в docx

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

ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcproj

@@ -708,6 +708,10 @@
 			<Filter
 				Name="Writer"
 				>
+				<File
+					RelativePath=".\BinWriter\BinEquationWriter.h"
+					>
+				</File>
 				<File
 					RelativePath=".\BinWriter\BinReaderWriterDefines.h"
 					>

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -422,7 +422,8 @@ extern int g_nCurFormatVersion;
 		fldstart = 9,
 		fldend = 10,
 		CommentReference = 11,
-		pptxDrawing = 12
+		pptxDrawing = 12,
+		object = 13
 	};}
 	namespace c_oSerImageType{enum c_oSerImageType
 	{

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -6,6 +6,8 @@
 #include "../../Common/Base64.h"
 #include "../../ASCOfficePPTXFile/Editor/FontCutter.h"
 #include "../../XlsxSerializerCom/Reader/BinaryWriter.h"
+#include "../../Common/DocxFormat/Source/MathEquation/MathEquation.h"
+#include "BinEquationWriter.h"
 
 namespace BinDocxRW
 {
@@ -4614,6 +4616,29 @@ namespace BinDocxRW
 						WriteComment(OOX::et_w_commentReference, pCommentReference->m_oId);
 						break;
 					}
+				/*case OOX::et_w_object:
+					{
+						int nCurPos = m_oBcw.WriteItemStart(c_oSerRunType::object);
+
+						OOX::Logic::CObject* pObject = static_cast<OOX::Logic::CObject*>(item);
+
+						OOX::Rels::CRelationShip* oRels = NULL;
+						smart_ptr<OOX::File> pFile = m_oParamsDocumentWriter.m_pRels->Find( OOX::RId(pObject->m_oOleObject->m_oId.get().GetValue()));
+
+						CString sLink;
+						if (pFile.IsInit() && OOX::FileTypes::OleObject == pFile->type())
+						{
+							OOX::HyperLink* pHyperlinkFile = static_cast<OOX::HyperLink*>(pFile.operator ->());
+							sLink = pHyperlinkFile->Uri().GetPath();
+						}
+						MathEquation::BinaryEquationWriter oBinEqWriter(m_oBcw.m_oStream);
+
+						MathEquation::CEquationReader oReader(sLink);
+						oReader.SetOutputDev(&oBinEqWriter);
+						oReader.Parse();
+						m_oBcw.WriteItemEnd(nCurPos);
+						break;
+					}*/
 				}
 			}
 		}

Common/DocxFormat/Projects/DocxFormat2005.vcproj

@@ -1409,6 +1409,34 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Equation"
+			>
+			<File
+				RelativePath="..\Source\MathEquation\LEStream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\MathEquation\MathEquation.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\MathEquation\MathEquation.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\MathEquation\OutputDev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\MathEquation\String.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\MathEquation\Types.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\Source\SystemUtility\FileSystem\Directory.cpp"
 			>