Bug 29105 - [Copy&Paste] JS ошибка после копирование маркерованного списка из...

Bug 29105 - [Copy&Paste] JS ошибка после копирование маркерованного списка из DE и cut&paste его же в PE

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

Common/Drawings/Format/Shape.js

@@ -229,7 +229,28 @@ function ConvertParagraphToPPTX(paragraph, drawingDocument, newParent)
     var _new_parent = isRealObject(newParent) ? newParent : paragraph.Parent;
 
     var new_paragraph = new Paragraph(_drawing_document, _new_parent, 0, 0, 0, 0, 0, true);
-    new_paragraph.Set_Pr(paragraph.Pr.Copy());
+    var oCopyPr = paragraph.Pr.Copy();
+
+    oCopyPr.ContextualSpacing = undefined;
+    oCopyPr.KeepLines       = undefined;
+    oCopyPr.KeepNext        = undefined;
+    oCopyPr.PageBreakBefore = undefined;
+    oCopyPr.Shd = undefined;
+    oCopyPr.Brd.First = undefined;
+    oCopyPr.Brd.Last  = undefined;
+    oCopyPr.Brd.Between = undefined;
+    oCopyPr.Brd.Bottom = undefined;
+    oCopyPr.Brd.Left = undefined;
+    oCopyPr.Brd.Right = undefined;
+    oCopyPr.Brd.Top = undefined;
+    oCopyPr.WidowControl = undefined;
+    oCopyPr.Tabs = undefined;
+    oCopyPr.NumPr = undefined;
+    oCopyPr.PStyle = undefined;
+    oCopyPr.FramePr = undefined;
+
+
+    new_paragraph.Set_Pr(oCopyPr);
     new_paragraph.TextPr.Set_Value( paragraph.TextPr.Value );
     new_paragraph.Internal_Content_Remove2(0, new_paragraph.Content.length);
     var Count = paragraph.Content.length;

PowerPoint/Editor/Format/Presentation.js

@@ -3640,27 +3640,27 @@ CPresentation.prototype =
 
     bringToFront : function()
     {
-        this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(this.Slides[this.CurPage].graphicObjects.bringToFront, false, historydescription_Presentation_BringToFront);   //TODO: Передавать тип проверки
+        this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(this.Slides[this.CurPage].graphicObjects.bringToFront, [], false, historydescription_Presentation_BringToFront);   //TODO: Передавать тип проверки
         this.Document_UpdateInterfaceState();
     },
 
     bringForward : function()
     {
-        this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(this.Slides[this.CurPage].graphicObjects.bringForward, false, historydescription_Presentation_BringForward);   //TODO: Передавать тип проверки
+        this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(this.Slides[this.CurPage].graphicObjects.bringForward, [],false, historydescription_Presentation_BringForward);   //TODO: Передавать тип проверки
         this.Document_UpdateInterfaceState();
     },
 
     sendToBack : function()
     {
 
-        this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(this.Slides[this.CurPage].graphicObjects.sendToBack, false, historydescription_Presentation_SendToBack);   //TODO: Передавать тип проверки
+        this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(this.Slides[this.CurPage].graphicObjects.sendToBack, [],false, historydescription_Presentation_SendToBack);   //TODO: Передавать тип проверки
         this.Document_UpdateInterfaceState();
     },
 
 
     bringBackward : function()
     {
-        this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(this.Slides[this.CurPage].graphicObjects.bringBackward, false, historydescription_Presentation_BringBackward);   //TODO: Передавать тип проверки
+        this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(this.Slides[this.CurPage].graphicObjects.bringBackward, [], false, historydescription_Presentation_BringBackward);   //TODO: Передавать тип проверки
         this.Document_UpdateInterfaceState();
     },