Bug 26494 - [CoEdit] Ошибка в консоли после передачи диаграммы с заливкой изображением

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

Common/Charts/DrawingObjects.js

@@ -32,9 +32,25 @@ function DrawingBounds(minX, maxX, minY, maxY)
 function getFullImageSrc(src) {
     if ( 0 != src.indexOf("http:") && 0 != src.indexOf("data:") && 0 != src.indexOf("https:") && 0 != src.indexOf("ftp:") && 0 != src.indexOf("file:") ) {
         var api = window["Asc"]["editor"];
-        if ( 0 == src.indexOf(g_sResourceServiceLocalUrl + api.documentId) )
-            return src;
-        return g_sResourceServiceLocalUrl + api.documentId + "/media/" + src;
+        if(api)
+        {
+            if ( 0 == src.indexOf(g_sResourceServiceLocalUrl + api.documentId) )
+                return src;
+            return g_sResourceServiceLocalUrl + api.documentId + "/media/" + src;
+        }
+        else
+        {
+            if(editor)
+            {
+                if (0 == src.indexOf(editor.DocumentUrl))
+                    return src;
+                return editor.DocumentUrl + "media/" + src;
+            }
+            else
+            {
+                return src;
+            }
+        }
     }
     else
         return src;

PowerPoint/Drawing/DrawingDocument.js

@@ -1042,6 +1042,11 @@ function CDrawingDocument()
         return false;
     }
 
+    this.ConvertCoordsToAnotherPage = function(x, y)
+    {
+        return {X: x, Y: y};
+    };
+
     this.SetCursorType = function(sType)
     {
         if ("" == this.m_sLockedCursorType)

Word/Editor/Table.js

@@ -3561,13 +3561,13 @@ CTable.prototype =
                                 var Alpha, RGBA = CellShd.Get_Color3(Theme, ColorMap);
                                 if(isRealNumber(CellShd.Unifill.transparent))
                                 {
-                                    Alpha = 255 - CellShd.Unifill.transparent;
+                                    Alpha = CellShd.Unifill.transparent;
                                 }
                                 else
                                 {
                                     Alpha = 255;
                                 }
-                                pGraphics.b_color1( RGBA.r, RGBA.g, RGBA.b, Alpha );
+                                pGraphics.b_color1( RGBA.R, RGBA.G, RGBA.B, Alpha );
                                 pGraphics.TableRect(Math.min(X_cell_start, X_cell_end), Math.min(Y, Y + RealHeight), Math.abs(X_cell_end - X_cell_start), Math.abs(RealHeight));
                             }
                             else
@@ -3661,13 +3661,13 @@ CTable.prototype =
                                 var Alpha, RGBA = CellShd.Get_Color3(Theme, ColorMap);
                                 if(isRealNumber(CellShd.Unifill.transparent))
                                 {
-                                    Alpha = 255 - CellShd.Unifill.transparent;
+                                    Alpha = CellShd.Unifill.transparent;
                                 }
                                 else
                                 {
                                     Alpha = 255;
                                 }
-                                pGraphics.b_color1( RGBA.r, RGBA.g, RGBA.b, Alpha );
+                                pGraphics.b_color1( RGBA.R, RGBA.G, RGBA.B, Alpha );
                                 pGraphics.TableRect(Math.min(X_cell_start, X_cell_end), Math.min(Y, Y + RealHeight), Math.abs(X_cell_end - X_cell_start), Math.abs(RealHeight));
                             }
                             else