getBase64Image

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

Common/Drawings/Format/ChartSpace.js

@@ -1796,23 +1796,7 @@ CChartSpace.prototype =
         this.group = group;
     },
 
-    getBase64Img: function ()
-    {
-        if(typeof this.cachedImage === "string")
-        {
-            return this.cachedImage;
-        }
-        var img_object = ShapeToImageConverter(this, this.pageIndex);
-        if(img_object)
-        {
-            return img_object.ImageUrl;
-        }
-        else
-        {
-
-            return "";
-        }
-    },
+    getBase64Img: CShape.prototype.getBase64Img,
 
     getRangeObjectStr: function()
     {

Common/Drawings/Format/GroupShape.js

@@ -262,23 +262,7 @@ CGroupShape.prototype =
         return getBoundsInGroup(this);
     },
 
-    getBase64Img: function ()
-    {
-        if(typeof this.cachedImage === "string")
-        {
-            return this.cachedImage;
-        }
-        var img_object = ShapeToImageConverter(this, this.pageIndex);
-        if(img_object)
-        {
-            return img_object.ImageUrl;
-        }
-        else
-        {
-
-            return "";
-        }
-    },
+    getBase64Img: CShape.prototype.getBase64Img,
 
     convertToWord: function(document)
     {

Common/Drawings/Format/Image.js

@@ -346,23 +346,7 @@ CImageShape.prototype =
         return false;
     },
 
-    getBase64Img: function ()
-    {
-        if(typeof this.cachedImage === "string")
-        {
-            return this.cachedImage;
-        }
-        var img_object = ShapeToImageConverter(this, this.pageIndex);
-        if(img_object)
-        {
-            return img_object.ImageUrl;
-        }
-        else
-        {
-
-            return "";
-        }
-    },
+    getBase64Img:  CShape.prototype.getBase64Img,
 
     convertToWord: function(document)
     {

Common/Drawings/Format/Shape.js

@@ -2638,6 +2638,8 @@ CShape.prototype =
         {
             return this.cachedImage;
         }
+        if(!isRealNumber(this.x) || !isRealNumber(this.y) || !isRealNumber(this.extX) || !isRealNumber(this.extY))
+            return "";
         var img_object = ShapeToImageConverter(this, this.pageIndex);
         if(img_object)
         {