подключены старые формулы

исправлен баг на сохранение сдвига формулы в документе

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

ASCHTMLRenderer/ASCHTMLRendererLib.vcproj

 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="ASCHTMLRenderer"
 	ProjectGUID="{DC24710E-8DF2-4A7A-B7C3-2313E294143C}"
 	RootNamespace="ASCHTMLRenderer"
@@ -417,18 +417,6 @@
 		<Filter
 			Name="MetaFile"
 			>
-			<File
-				RelativePath="..\DesktopEditor\raster\Metafile\Common.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\DesktopEditor\raster\Metafile\Common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\DesktopEditor\raster\Metafile\Common\IOutputDevice.h"
-				>
-			</File>
 			<File
 				RelativePath="..\DesktopEditor\raster\Metafile\MetaFile.cpp"
 				>
@@ -437,155 +425,123 @@
 				RelativePath="..\DesktopEditor\raster\Metafile\MetaFile.h"
 				>
 			</File>
-			<File
-				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileClip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileObjects.h"
-				>
-			</File>
-			<File
-				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileRenderer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileTypes.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileTypes.h"
-				>
-			</File>
 			<Filter
 				Name="Wmf"
 				>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\RendererOutput.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfClip.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfCharsets.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfClip.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfCodePage1361.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfFile.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfCodePage932.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfObjects.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfCodePage936.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfObjects.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfCodePage949.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfPlayer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfCodePage950.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfPlayer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfColor.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfTypes.h"
 					>
 				</File>
+			</Filter>
+			<Filter
+				Name="Emf"
+				>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfFile.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfClip.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfMemory.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfClip.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfObjects.cpp"
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfFile.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfObjects.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfObjects.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfOutputDevice.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfObjects.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfPlayer.cpp"
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPath.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfPlayer.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPath.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfRegion.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPlayer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfTypes.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPlayer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfUtils.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfTypes.h"
 					>
 				</File>
 			</Filter>
 			<Filter
-				Name="Emf"
+				Name="Common"
 				>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfClip.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfClip.h"
-					>
-				</File>
-				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfFile.h"
-					>
-				</File>
-				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfObjects.cpp"
+					RelativePath="..\DesktopEditor\raster\Metafile\Common\IOutputDevice.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfObjects.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFile.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfOutputDevice.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileClip.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPath.cpp"
+					RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileObjects.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPath.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPlayer.cpp"
+					RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileTypes.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPlayer.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileTypes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfTypes.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileUtils.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\DesktopEditor\raster\Metafile\Emf\RendererOutput.h"
+					RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileUtils.h"
 					>
 				</File>
 			</Filter>

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -4045,17 +4045,17 @@ public:
 		int res = c_oSerConstants::ReadOk;
 		if ( c_oSer_OMathBottomNodesValType::Val == type )
 		{
-			BYTE MJc;
-			CString sMJc (_T("centerGroup"));
-			MJc = m_oBufferedStream.GetUChar();			
-			switch(MJc)
+			BYTE Jc;
+			CString sJc (_T("centerGroup"));
+			Jc = m_oBufferedStream.GetUChar();			
+			switch(Jc)
 			{
-				case 0: sMJc = _T("center");break;
-				case 1: sMJc = _T("centerGroup");break;
-				case 2: sMJc = _T("left");break;
-				case 3: sMJc = _T("right");break;
+				case 0:	sJc = _T("center");break;
+				case 1:	sJc = _T("centerGroup");break;
+				case 2:	sJc = _T("left");break;
+				case 3:	sJc = _T("right");break;
 			}			
-            CString sVal; sVal.Format(_T("<m:mJc m:val=\"%ls\" />"), sMJc);
+            CString sVal; sVal.Format(_T("<m:jc m:val=\"%ls\" />"), sJc);
 			GetRunStringWriter().WriteString(sVal);
 		}
 		else

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -4589,7 +4589,6 @@ namespace BinDocxRW
 				case OOX::et_w_object:
 					{
 						int nCurPos = m_oBcw.WriteItemStart(c_oSerRunType::object);						
-
 						//write Picture
 
 						CString* pXml = NULL;
@@ -4597,12 +4596,8 @@ namespace BinDocxRW
 						OOX::Logic::CObject* pObject = static_cast<OOX::Logic::CObject*>(item);
 						pXml = pObject->m_sXml.GetPointer();
 
-						int nCurPos1 = m_oBcw.WriteItemStart(c_oSerRunType::pptxDrawing);
-						WriteDrawing(pXml, NULL, NULL);
-						m_oBcw.WriteItemEnd(nCurPos1);
-
 						//write equation
-						/*if (pObject->m_oOleObject.IsInit())
+						if (pObject->m_oOleObject.IsInit())
 						{
 							CString sProgID = pObject->m_oOleObject->m_sProgId.get().GetString();
 							if ( _T("Equation.3") == sProgID)
@@ -4622,7 +4617,12 @@ namespace BinDocxRW
 								oReader.SetOutputDev(&oBinEqWriter);
 								oReader.Parse();								
 							}
-						}*/
+						}
+
+						int nCurPos1 = m_oBcw.WriteItemStart(c_oSerRunType::pptxDrawing);
+						WriteDrawing(pXml, NULL, NULL);
+						m_oBcw.WriteItemEnd(nCurPos1);
+						
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //1
-//322
-#define INTVER 2,0,1,322
-#define STRVER "2,0,1,322\0"
+//323
+#define INTVER 2,0,1,323
+#define STRVER "2,0,1,323\0"

DesktopEditor/raster/Metafile/Common/MetaFileUtils.cpp

@@ -4,6 +4,7 @@
 #include "../../raster/BgraFrame.h"
 
 #include <time.h>
+#include <math.h>
 
 #define U_TO_UTF8(val) NSFile::CUtf8Converter::GetUtf8StringFromUnicode2(val.c_str(), val.length())