X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Gnumeric.js;h=de5fd975a95df2f49b01c750067e1009556cc31e;hp=2574bd27b3cc8cf6ca5b3f0343ff55b2011941d1;hb=8cd2a9237c684aa16bc21e3ac6d3793c49c65400;hpb=0280a4e403d14ba7108d037e441da70094f73719

diff --git a/Pman.Gnumeric.js b/Pman.Gnumeric.js
index 2574bd27..de5fd975 100644
--- a/Pman.Gnumeric.js
+++ b/Pman.Gnumeric.js
@@ -1164,11 +1164,22 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         var ww = 0.01; // offset a bit...
         var hh = 0.01; //
         
+        var rowHeight = typeof(this.rowInfoDom[row]) == 'undefined' ? 100 : 
+		this.rowInfoDom[row].getAttribute('Unit')*1;
+	
+	
         var ww2 = 1 - ((colwidth - width) / this.colInfo[endcol]);
-        var hh2 = 0.99;
+        var hh2 = 1 - ((rowHeight - height) /    rowHeight);
         
         var offset_str = ww + ' '  + hh + ' ' + ww2 + ' '+hh2;
         
+	// offset string 0.01 0.01 0.01 0.392 << last one needs to be calculated based on proportions.
+	// so what are our dimentions..
+	
+	
+	
+	
+	
         //alert(offset_str);
         soi.setAttribute('ObjectOffset', offset_str);
         soi.setAttribute('ObjectAnchorType','16 16 16 16');
@@ -1178,9 +1189,14 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         soi.setAttribute('crop-left','0.000000');
         soi.setAttribute('crop-right','0.000000');
         
+	
+	
+	
+	
         var content = this.doc.createElement('Content');
         content.setAttribute('image-type', type ? type : 'jpeg');
         content.setAttribute('size-bytes', size);
+	content.appendChild( this.doc.createTextNode(data));
         soi.appendChild(content);
         objs.appendChild(soi);
         
@@ -1218,6 +1234,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
      * @param {Number} width image height
      * 
      */
+    
     writeImage : function (row, col, data, width, height, type) 
     {
         
@@ -1274,8 +1291,12 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         var ww = 0.01; // offset a bit...
         var hh = 0.01; //
         
+	var rowHeight = typeof(this.rowInfoDom[row]) == 'undefined' ? 100 : 
+		this.rowInfoDom[row].getAttribute('Unit')*1;
+	
+	
         var ww2 = 1 - ((colwidth - width) / this.colInfo[endcol]);
-        var hh2 = 0.99;
+        var hh2 = 1 - ((rowHeight - height) /    rowHeight);
         
         var offset_str = ww + ' '  + hh + ' ' + ww2 + ' '+hh2;
         
@@ -1360,7 +1381,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         var content = this.doc.createElement('Content');
         content.setAttribute('image-type', type ? type : 'jpeg');
         content.setAttribute('size-bytes', size);
-        content.textContent = data;
+        content.appendChild( this.doc.createTextNode(data));
         soi.appendChild(content);
         objs.appendChild(soi);
         
@@ -1416,6 +1437,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         var content = this.doc.createElement('Content');
         content.setAttribute('image-type', type ? type : 'jpeg');
         content.setAttribute('name', name);
+	
         soi.appendChild(content);
         objs.appendChild(soi);
         
@@ -1687,6 +1709,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         }
         
         var ser = new XMLSerializer();
+	Roo.get(document.body).mask("Downloading");
         var x = new Pman.Download({
             method: 'POST',
             timeout : 120000, // quite a long wait.. 2 minutes.
@@ -1698,11 +1721,16 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
             },
             url : (this.downloadURL || (baseURL + '/GnumericToExcel/')) + name + '.xls',
             success : function() {
+		Roo.get(document.body).unmask();
                 Roo.MessageBox.alert("Alert", "File should have downloaded now");
                 if (callback) {
                     callback();
                 }
-            }
+            },
+	    failure : function() {
+		Roo.get(document.body).unmask();
+		Roo.MessageBox.alert("Alert", "Download failed");
+	    }
         });
          
     }