Commit d6c1dcca authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

Bug 15005 - Не отменяются границы ячеек загруженной таблицы.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53074 954022d7-b5bf-4e40-9824-e11837661b57
parent 8f16fad1
...@@ -2370,7 +2370,7 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, aDxfs, aXfs, aF ...@@ -2370,7 +2370,7 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, aDxfs, aXfs, aF
var col = aCols[nIndex]; var col = aCols[nIndex];
if(null != col) if(null != col)
{ {
if(false == col.isEmptyToSave()) if(false == col.isEmpty())
{ {
if(null != oAllCol && null == nPrevIndex && nIndex > 0) if(null != oAllCol && null == nPrevIndex && nIndex > 0)
{ {
...@@ -2772,7 +2772,7 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, aDxfs, aXfs, aF ...@@ -2772,7 +2772,7 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, aDxfs, aXfs, aF
var row = ws.aGCells[aIndexes[i]]; var row = ws.aGCells[aIndexes[i]];
if(null != row) if(null != row)
{ {
if(false == row.isEmptyToSave()) if(false == row.isEmpty())
this.bs.WriteItem(c_oSerWorksheetsTypes.Row, function(){oThis.WriteRow(row);}); this.bs.WriteItem(c_oSerWorksheetsTypes.Row, function(){oThis.WriteRow(row);});
} }
} }
...@@ -2838,7 +2838,8 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, aDxfs, aXfs, aF ...@@ -2838,7 +2838,8 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, aDxfs, aXfs, aF
if(!oThis.isCopyPaste || (oThis.isCopyPaste && cell)) if(!oThis.isCopyPaste || (oThis.isCopyPaste && cell))
{ {
var nXfsId = this.prepareXfs(cell.xfs); var nXfsId = this.prepareXfs(cell.xfs);
if(0 != nXfsId || false == cell.isEmptyText()) //сохраняем как и Excel даже пустой стиль(нужно чтобы убрать стиль строки/колонки)
if(null != cell.xfs || false == cell.isEmptyText())
this.bs.WriteItem(c_oSerRowTypes.Cell, function(){oThis.WriteCell(cell, nXfsId);}); this.bs.WriteItem(c_oSerRowTypes.Cell, function(){oThis.WriteCell(cell, nXfsId);});
}; };
}; };
......
This diff is collapsed.
...@@ -2050,13 +2050,9 @@ Col.prototype = ...@@ -2050,13 +2050,9 @@ Col.prototype =
} }
return bRes; return bRes;
}, },
isEmptyToSave : function()
{
return null == this.BestFit && null == this.hd && null == this.width && null == this.xfs && null == this.CustomWidth;
},
isEmpty : function() isEmpty : function()
{ {
return this.isEmptyToSave(); return null == this.BestFit && null == this.hd && null == this.width && null == this.xfs && null == this.CustomWidth;
}, },
Remove : function() Remove : function()
{ {
...@@ -2303,7 +2299,7 @@ Row.prototype = ...@@ -2303,7 +2299,7 @@ Row.prototype =
{ {
this.r += nDif; this.r += nDif;
}, },
isEmptyToSave : function() isEmpty : function()
{ {
if(null != this.xfs || null != this.h || null != this.hd || null != this.CustomHeight) if(null != this.xfs || null != this.h || null != this.hd || null != this.CustomHeight)
return false; return false;
...@@ -2317,10 +2313,6 @@ Row.prototype = ...@@ -2317,10 +2313,6 @@ Row.prototype =
return false; return false;
return true; return true;
}, },
isEmpty : function()
{
return this.isEmptyToSave();
},
Remove : function() Remove : function()
{ {
this.ws._removeRow(this.index); this.ws._removeRow(this.index);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment