X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Gnumeric.js;h=d7755d0725223d2d68ed9455437691bec4f6ab3c;hp=1dba18768b17e0b98ed7c312931c0d474277aa13;hb=692861c958898f425cc365906c092559d7cfc60c;hpb=0c025f8d7cb751ef2424c5810621ff9e2b604d25

diff --git a/Pman.Gnumeric.js b/Pman.Gnumeric.js
index 1dba1876..d7755d07 100644
--- a/Pman.Gnumeric.js
+++ b/Pman.Gnumeric.js
@@ -327,7 +327,6 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
                }
            }
             
-            
         });
         // read colinfo..
         var ci = this.sheet.getElementsByTagNameNS('*','ColInfo');
@@ -1237,75 +1236,30 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
     
     writeFixedImage : function (startCol, startRow, endCol, endRow, type, data, width, height) 
     {
-        
         if (!data) {
             throw "write Image called with missing data";
         }
-        // our default height width is 50/50 ?!
-        //console.log('w='+width+',height='+height);
-                //        <gmr:Objects>
-        row*=1;
-        col*=1;
-        height*=1;
-        width*=1;
-        var objs = this.sheet.getElementsByTagNameNS('*','Objects')[0];
-        var soi = this.doc.createElementNS('http://www.gnumeric.org/v10.dtd', 'gnm:SheetObjectImage');
         
-        //<gmr:SheetObjectImage 
-        //      ObjectBound="A3:J8" 
-        //      ObjectOffset="0.375 0.882 0.391 0.294" 
-        //      ObjectAnchorType="16 16 16 16" 
-        //      Direction="17" 
-        //      crop-top="0.000000" 
-        //      crop-bottom="0.000000" 
-        //      crop-left="0.000000" 
-        //      crop-right="0.000000">
-                
-                
-        //alert(gnumeric_colRowToName(row,col));
-               
-        // this is where we really have fun!!!... 
-        // since our design currently assumes the height is enough to fit
-        // stuff in, we only really need to work out how wide it has to be..
-        
-        // note we should probably use centralized calcs if it fits in the first cell!
+        startCol = startCol * 1;
+        startRow = startRow * 1;
+        endCol = endCol * 1;
+        endRow = endRow * 1;
+        width = width * 1;
+        height = height * 1;
         
-        // step 1 - work out how many columns it will span..
-        // lets hope the spreadsheet is big enought..
-        var colwidth = 0;
-        var endcol=col;
-        for ( endcol=col;endcol <100; endcol++) {
-            if (!this.colInfo[endcol]) {
-                this.colInfo[endcol] = 100; // eak fudge
-            }
-            colwidth += this.colInfo[endcol];
-            if (colwidth > width) {
-                break;
-            }
-        }
-        
-        soi.setAttribute('ObjectBound',
-            //gnumeric_colRowToName(row,col) + ':' + gnumeric_colRowToName(row+1,col+1));
-            this.RCtoCell(row,col) + ':' + this.RCtoCell(row,endcol));
-     
-        var ww = 0.01; // offset a bit...
-        var hh = 0.01; //
+        var objs = this.sheet.getElementsByTagNameNS('*','Objects')[0];
+        var soi = this.doc.createElementNS('http://www.gnumeric.org/v10.dtd', 'gnm:SheetObjectImage');
         
-        var ww2 = 1 - ((colwidth - width) / this.colInfo[endcol]);
-        var hh2 = 0.99;
+        soi.setAttribute('ObjectBound',this.RCtoCell(startRow, startCol) + ':' + this.RCtoCell(endRow, endCol));
         
-        var offset_str = ww + ' '  + hh + ' ' + ww2 + ' '+hh2;
-        //console.log(offset_str );
-        //alert(offset_str);
-        soi.setAttribute('ObjectOffset', offset_str);
+        soi.setAttribute('ObjectOffset', '0 0 0 0');
         soi.setAttribute('ObjectAnchorType','16 16 16 16');
         soi.setAttribute('Direction','17');
         soi.setAttribute('crop-top','0.000000');
         soi.setAttribute('crop-bottom','0.000000');
         soi.setAttribute('crop-left','0.000000');
         soi.setAttribute('crop-right','0.000000');
-                // <Content image-type="jpeg" size-bytes="3900">......  < / Content>
-                
+        
         var name = 'Image' + Math.random().toString(36).substring(2);
         var content = this.doc.createElement('Content');
         content.setAttribute('image-type', type ? type : 'jpeg');
@@ -1313,6 +1267,8 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         soi.appendChild(content);
         objs.appendChild(soi);
         
+        Roo.log(name);
+        
         var godoc = this.doc.getElementsByTagNameNS('*','GODoc')[0];
         
         var goimage = this.doc.createElement('GOImage');
@@ -1326,9 +1282,6 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         godoc.appendChild(goimage);
         
         return true;
-                //< /gnm:SheetObjectImage>
-                // < /gnm:Objects>
-
     },
  
     /**