Fix #5791 - Search Criteria on Orders / Columns on orders

[Pman.Core] / Pman.Gnumeric.js

diff --git a/Pman.Gnumeric.js b/Pman.Gnumeric.js
index 2f2efef..75b30bf 100644 (file)
--- 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');
@@ -834,14 +833,13 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
                 this.setRowHeight( row + yoff +1, Roo.get(rows[row]).getHeight());
             }
             
-         
             var cols = rows[row].getElementsByTagName('td');
             
-            
             for(var col=0;col < cols.length; col++) {
                 
-                
-               
+                if (cols[col].getAttribute('xls:width')) {
+                    this.setColumnWidth(col, 1 * cols[col].getAttribute('xls:width'));
+                }
                 
                 var colspan = cols[col].getAttribute('colspan');
                 colspan  = colspan ? colspan *1 : 1;
@@ -1251,28 +1249,16 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         var objs = this.sheet.getElementsByTagNameNS('*','Objects')[0];
         var soi = this.doc.createElementNS('http://www.gnumeric.org/v10.dtd', 'gnm:SheetObjectImage');
         
-        soi.setAttribute('ObjectBound',
-            //gnumeric_colRowToName(row,col) + ':' + gnumeric_colRowToName(row+1,col+1));
-            this.RCtoCell(startRow,col) + ':' + this.RCtoCell(row,endcol));
-     
-        var ww = 0.01; // offset a bit...
-        var hh = 0.01; //
-        
-        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');
@@ -1280,6 +1266,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');
@@ -1293,9 +1281,6 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         godoc.appendChild(goimage);
         
         return true;
-                //< /gnm:SheetObjectImage>
-                // < /gnm:Objects>
-
     },
  
     /**
@@ -1416,7 +1401,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         column = column *1; 
         width= width*1;
         if (typeof(this.colInfoDom[column]) == 'undefined') {
-            var cols = this.doc.getElementsByTagNameNS('*','Cols')[0];
+            var cols = this.sheet.getElementsByTagNameNS('*','Cols')[0];
             var ri = this.doc.createElementNS('http://www.gnumeric.org/v10.dtd', 'gnm:ColInfo');
             ri.setAttribute('No', column);
             ri.setAttribute('Unit', width);