git-svn-id:...

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

PowerPoint/Editor/Format.js

@@ -5330,7 +5330,7 @@ function CTextParagraphPr()
     this.bullet = new CBullet();
     this.lvl = null;
     this.pPr = new CParaPr();
-    this.rPr = null;
+    this.rPr = new CTextPr();
 
     this.createDuplicate = function()
     {

PowerPoint/Editor/Format/Presentation.js

@@ -6592,7 +6592,8 @@ CPresentation.prototype =
             case historyitem_Presenattion_RemoveSlide:
             case historyitem_Presenattion_AddSlide:
             {
-                Writer.WriteLong(Data.Pos);
+                var Pos = Data.UseArray ? Data.PosArray[0] : Data.Pos;
+                Writer.WriteLong(Pos);
                 Writer.WriteString2(Data.Id);
                 break;
             }
@@ -6667,7 +6668,6 @@ CPresentation.prototype =
             {
                 var pos = this.m_oContentChanges.Check( contentchanges_Add, Reader.GetLong());
                 var Id = Reader.GetString2();
-
                 this.Slides.splice(pos, 0, g_oTableId.Get_ById(Id));
                 this.recalcMap[this.Slides[pos].Get_Id()] = this.Slides[pos];
                 CollaborativeEditing.Add_ChangedClass(this);

PowerPoint/api.js

@@ -924,6 +924,7 @@ asc_docs_api.prototype.OpenDocument2 = function(url, gObject)
 	this.FontLoader.LoadDocumentFonts(this.WordControl.m_oLogicDocument.Fonts, false);
 
     this.ParcedDocument = true;
+    g_oIdCounter.Set_Load(false);
 	if (this.isStartCoAuthoringOnEndLoad) {
 		this.CoAuthoringApi.onStartCoAuthoring(true);
 		this.isStartCoAuthoringOnEndLoad = false;