Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

build/configs/webpowerpoint.json

@@ -48,6 +48,7 @@
 		"../common/Drawings/Format/ChartSpace.js",
 		"../common/Drawings/Format/ChartFormat.js",
 		"../common/Drawings/Format/TextBody.js",
+		"../slide/Editor/Format/TextBodyPrototype.js",
 		"../common/Drawings/Format/GraphicFrame.js",
         "../common/Charts/charts.js",
 		"../common/Charts/DrawingArea.js",
@@ -88,6 +89,7 @@
         "../slide/Drawing/ThemeLoader.js",
         "../word/Editor/Serialize2.js",
         "../word/Editor/Styles.js",
+		"../slide/Editor/Format/StylesPrototype.js",
         "../word/Editor/Numbering.js",
         "../slide/Editor/CollaborativeEditing.js",
         "../word/Drawing/GraphicsEvents.js",

common/clipboard_base.js

@@ -602,6 +602,7 @@ CClipboardBase.prototype =
             ifr.style.height = '100px';
             ifr.style.overflow = 'hidden';
             ifr.style.zIndex = -1000;
+            ifr.setAttribute("sandbox", "");
             document.body.appendChild(ifr);
 
             this.CommonIframe = ifr;

common/wordcopypaste.js

@@ -2398,6 +2398,7 @@ function Body_Paste(api, e)
                     ifr.style.height = '100px';
                     ifr.style.overflow = 'hidden';
                     ifr.style.zIndex = -1000;
+					ifr.setAttribute("sandbox", "");
                     document.body.appendChild(ifr);
                 }
 				else

slide/Editor/Format/ShapePrototype.js

@@ -50,32 +50,6 @@ pHText[0][AscFormat.phType_subTitle] = "Slide subtitle";// "Подзаголов
 pHText[0][AscFormat.phType_tbl]      = "Table";// "Таблица"; //(Table)                              ;
 pHText[0][AscFormat.phType_title]    = "Slide title";// "Заголовок слайда" ;  //(Title)             ;
 
-CRFonts.prototype.Merge = function(RFonts)
-{
-    if ( undefined !== RFonts.Ascii )
-        this.Ascii = RFonts.Ascii;
-
-    if ( undefined != RFonts.EastAsia )
-        this.EastAsia = RFonts.EastAsia;
-    else if ( undefined !== RFonts.Ascii )
-        this.EastAsia = RFonts.Ascii;
-
-    if ( undefined != RFonts.HAnsi )
-        this.HAnsi = RFonts.HAnsi;
-
-    else if ( undefined !== RFonts.Ascii )
-        this.HAnsi = RFonts.Ascii;
-
-    if ( undefined != RFonts.CS )
-        this.CS = RFonts.CS;
-
-    else if ( undefined !== RFonts.Ascii )
-        this.CS = RFonts.Ascii;
-
-    if ( undefined != RFonts.Hint )
-        this.Hint = RFonts.Hint;
-};
-
 CShape.prototype.setDrawingObjects = function(drawingObjects)
 {
 };
@@ -802,15 +776,6 @@ CShape.prototype.Set_CurrentElement = function(bUpdate, pageIndex)
     }
 };
 
-AscFormat.CTextBody.prototype.Get_Worksheet = function()
-{
-    return this.parent && this.parent.Get_Worksheet && this.parent.Get_Worksheet();
-};
-AscFormat.CTextBody.prototype.getDrawingDocument = function()
-{
-    return this.parent && this.parent.getDrawingDocument && this.parent.getDrawingDocument();
-};
-
     //--------------------------------------------------------export----------------------------------------------------
     window['AscFormat'] = window['AscFormat'] || {};
     window['AscFormat'].G_O_DEFAULT_COLOR_MAP = G_O_DEFAULT_COLOR_MAP;

slide/Editor/Format/StylesPrototype.js

+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2016
+ *
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ *
+ * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ *
+ * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ *
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
+ *
+ * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic 
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
+ * in every copy of the program you distribute. 
+ * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ *
+*/
+"use strict";
+
+(function(window, undefined){
+CRFonts.prototype.Merge = function(RFonts)
+{
+    if ( undefined !== RFonts.Ascii )
+        this.Ascii = RFonts.Ascii;
+
+    if ( undefined != RFonts.EastAsia )
+        this.EastAsia = RFonts.EastAsia;
+    else if ( undefined !== RFonts.Ascii )
+        this.EastAsia = RFonts.Ascii;
+
+    if ( undefined != RFonts.HAnsi )
+        this.HAnsi = RFonts.HAnsi;
+
+    else if ( undefined !== RFonts.Ascii )
+        this.HAnsi = RFonts.Ascii;
+
+    if ( undefined != RFonts.CS )
+        this.CS = RFonts.CS;
+
+    else if ( undefined !== RFonts.Ascii )
+        this.CS = RFonts.Ascii;
+
+    if ( undefined != RFonts.Hint )
+        this.Hint = RFonts.Hint;
+};
+})(window);

slide/Editor/Format/TextBodyPrototype.js

+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2016
+ *
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ *
+ * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ *
+ * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ *
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
+ *
+ * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic 
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
+ * in every copy of the program you distribute. 
+ * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ *
+*/
+"use strict";
+
+(function(window, undefined){
+    AscFormat.CTextBody.prototype.Get_Worksheet = function()
+    {
+        return this.parent && this.parent.Get_Worksheet && this.parent.Get_Worksheet();
+    };
+    AscFormat.CTextBody.prototype.getDrawingDocument = function()
+    {
+        return this.parent && this.parent.getDrawingDocument && this.parent.getDrawingDocument();
+    };
+})(window);