ошибка при открытии автофигуры <w:pict></w:pict>

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60592 954022d7-b5bf-4e40-9824-e11837661b57

Word/Editor/Serialize2.js

@@ -7923,8 +7923,13 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
 		}
 		else if( c_oSerImageType2.PptxData === type )
         {
-			var grObject = window.global_pptx_content_loader.ReadDrawing(this, this.stream, this.Document, oParaDrawing);
-            oParaDrawing.Set_GraphicObject(grObject);
+			if(length > 0){
+				var grObject = window.global_pptx_content_loader.ReadDrawing(this, this.stream, this.Document, oParaDrawing);
+				if(null != grObject)
+					oParaDrawing.Set_GraphicObject(grObject);
+			}
+			else
+				res = c_oSerConstants.ReadUnknown;
 		}
 		else if( c_oSerImageType2.Chart2 === type )
         {

Word/Editor/SerializeCommon.js

@@ -58,40 +58,41 @@ function CPPTXContentLoader()
 
         var _rec_start = s.cur;
         var _end_rec = _rec_start + s.GetULong() + 4;
-
-        s.Skip2(5); // 1 + 4 byte - len
-
-        var _type = s.GetUChar();
-        switch (_type)
-        {
-            case 1:
-            {
-                GrObject = this.ReadShape();
-                break;
-            }
-            case 2:
-            {
-                GrObject = this.ReadPic();
-                break;
-            }
-            case 3:
-            {
-                GrObject = this.ReadCxn();
-                break;
-            }
-            case 4:
-            {
-                GrObject = this.ReadGroupShape();
-                break;
-            }
-            case 5:
-            {
-                s.SkipRecord();
-                break;
-            }
-            default:
-                break;
-        }
+		if (s.cur < _end_rec){
+			s.Skip2(5); // 1 + 4 byte - len
+
+			var _type = s.GetUChar();
+			switch (_type)
+			{
+				case 1:
+				{
+					GrObject = this.ReadShape();
+					break;
+				}
+				case 2:
+				{
+					GrObject = this.ReadPic();
+					break;
+				}
+				case 3:
+				{
+					GrObject = this.ReadCxn();
+					break;
+				}
+				case 4:
+				{
+					GrObject = this.ReadGroupShape();
+					break;
+				}
+				case 5:
+				{
+					s.SkipRecord();
+					break;
+				}
+				default:
+					break;
+			}
+		}
 
         s.Seek2(_end_rec);
         stream.pos = s.pos;