чарт в шейпе (1.0.0.238)

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

ASCOfficePPTXFile/Editor/BinWriters.h

@@ -1405,6 +1405,16 @@ namespace NSBinPptxRW
 			return m_lPos;
 		}
 
+		LONG GetSize()
+		{
+			return m_lSize;
+		}
+
+		BYTE* GetData()
+		{
+			return m_pData;
+		}
+
 	public:
 		void Deserialize(NSBinPptxRW::CImageManager2* pManager, LPSAFEARRAY pArray)
 		{

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h

@@ -264,6 +264,8 @@ namespace PPTX
 								LONG lLenRec = pReader->GetLong();
 
 								LONG lPosition = pReader->GetPos();
+								LONG lSize_Reader = pReader->GetSize();
+								BYTE* pData_Reader = pReader->GetData();
 
 								DocxFile2::IAVSOfficeDocxFile2* pDocxFile2 = NULL;
 								pReader->m_pMainDocument->QueryInterface(DocxFile2::IID_IAVSOfficeDocxFile2, (void**)&pDocxFile2);
@@ -279,7 +281,8 @@ namespace PPTX
 
 								SysFreeString(bsXmlContent);
 
-								pReader->Seek(lPosition + lLenRec);
+								//pReader->Seek(lPosition + lLenRec);
+								pReader->Init(pData_Reader, lPosition + lLenRec, lSize_Reader - (lPosition + lLenRec));
 							}
 							else
 							{

ASCOfficePPTXFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//237
-#define INTVER 1,0,0,237
-#define STRVER "1,0,0,237\0"
+//238
+#define INTVER 1,0,0,238
+#define STRVER "1,0,0,238\0"