(2.0.0.184): ASCOfficeDocxFile2

подключены формулы на чтение.
поправлены ф-лы на чтение из doc

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

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -423,7 +423,7 @@ extern int g_nCurFormatVersion;
 		fldend = 10,
 		CommentReference = 11,
 		pptxDrawing = 12,
-		object = 13
+		object = 14
 	};}
 	namespace c_oSerImageType{enum c_oSerImageType
 	{

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -2712,7 +2712,7 @@ namespace BinDocxRW
 						WriteComment(OOX::et_w_commentRangeEnd, pCommentRangeEnd->m_oId);
 						break;
 					}
-				/*case OOX::et_m_oMathPara:
+				case OOX::et_m_oMathPara:
 					{
 						OOX::Logic::COMathPara* pOMathPara = static_cast<OOX::Logic::COMathPara*>(item);
 						nCurPos = m_oBcw.WriteItemStart(c_oSerParType::OMathPara);
@@ -2727,7 +2727,7 @@ namespace BinDocxRW
 						WriteMathArgNodes( pOMath->m_arrItems );
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
-					}*/
+					}
 				}
 			}
 		};

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //0
-//184
-#define INTVER 2,0,0,184
-#define STRVER "2,0,0,184\0"
+//185
+#define INTVER 2,0,0,185
+#define STRVER "2,0,0,185\0"

Common/DocxFormat/Source/MathEquation/MathEquation.cpp

@@ -210,13 +210,13 @@ int  CEquationReader::HandleChar(uint8_t nTag)
     if (nChar < 0x20)
         return nRet;
 
-	pOutputDev->BeginChar(nChar, nTypeFace, IsSpecialChar(nChar));
-
 	if (xfEMBELL(nTag))
 	{
 		nRet = HandleRecords();
 	}
 
+	pOutputDev->BeginChar(nChar, nTypeFace, IsSpecialChar(nChar));	
+
 	pOutputDev->EndChar();
 	return nRet;
 }