правка бага с дупликатом слайда с картинкой

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

Common/Charts/DrawingObjects.js

@@ -2226,7 +2226,9 @@ asc_CParagraphTabs.prototype = {
 	asc_getCount: function (){ return this.Tabs.length; },
 	asc_getTab: function (Index){ return this.Tabs[Index]; },
 	asc_addTab: function (Tab){ this.Tabs.push(Tab) },
-	asc_clear: function (){ this.Tabs.length = 0; }
+	asc_clear: function (){ this.Tabs.length = 0; },
+    add_Tab: function (Tab){ this.Tabs.push(Tab) },
+
 }
 
 //{ asc_CParagraphTabs export
@@ -2238,6 +2240,8 @@ prot["asc_getCount"] = prot.asc_getCount;
 prot["asc_getTab"] = prot.asc_getTab;
 prot["asc_addTab"] = prot.asc_addTab;
 prot["asc_clear"] = prot.asc_clear;
+prot["add_Tab"] = prot.add_Tab;
+
 //}
 
 //-----------------------------------------------------------------------------------

Common/wordcopypaste.js

@@ -3224,7 +3224,7 @@ PasteProcessor.prototype =
 			aPrepeareImages.push(i);
 		return {content: aContent, fonts: aPrepeareFonts, images: aPrepeareImages, bAddNewStyles: addNewStyles, aPastedImages: aPastedImages};
 	},
-	Start : function(node, nodeDisplay)
+	Start : function(node, nodeDisplay, bDuplicate)
     {
 		if(g_bIsDocumentCopyPaste)
         {
@@ -3574,7 +3574,8 @@ PasteProcessor.prototype =
                             var arr_layouts_id = [];
                             var arr_slides = [];
                             var loader = new BinaryPPTYLoader();
-                            loader.Start_UseFullUrl();
+                            if(!(bDuplicate === true))
+                                loader.Start_UseFullUrl();
                             loader.stream = stream;
                             loader.presentation = editor.WordControl.m_oLogicDocument;
                             var slide_count = stream.GetULong();

PowerPoint/api.js

@@ -3976,8 +3976,9 @@ asc_docs_api.prototype.DublicateSlide = function()
     copy_processor.oPresentationWriter.End_UseFullUrl();
     copy_processor.Start();
     var oPasteProcessor = new PasteProcessor(this, true, true, false);
+    //oPasteProcessor.End_UseFullUrl();
     History.Create_NewPoint();
-    oPasteProcessor.Start(copy_processor.ElemToSelect, copy_processor.ElemToSelect);
+    oPasteProcessor.Start(copy_processor.ElemToSelect, copy_processor.ElemToSelect, true);
     this.WordControl.m_oLogicDocument.Document_UpdateInterfaceState();
 }