Commit 17323484 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=27022 - [CoEdit] Потеря фоновой заливки,...

http://bugzserver/show_bug.cgi?id=27022 -  [CoEdit] Потеря фоновой заливки, полученной вставкой листа целиком из другой книги, после передачи другому пользователю

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58822 954022d7-b5bf-4e40-9824-e11837661b57
parent 223522bc
......@@ -4161,7 +4161,7 @@
};
}
/** @constructor */
function Binary_StylesTableReader(stream, wb, aCellXfs, Dxfs)
function Binary_StylesTableReader(stream, wb, aCellXfs, Dxfs, isCopyPaste)
{
this.stream = stream;
this.wb = wb;
......@@ -4170,6 +4170,7 @@
this.Dxfs = Dxfs;
this.bcr = new Binary_CommonReader(this.stream);
this.bssr = new Binary_SharedStringTableReader(this.stream, wb);
this.isCopyPaste = isCopyPaste;
this.Read = function()
{
var oThis = this;
......@@ -4318,7 +4319,7 @@
oNewXfs.XfId = XfIdTmp;
}
if(0 == this.aCellXfs.length)
if(0 == this.aCellXfs.length && !this.isCopyPaste)
this.oStyleManager.init(oNewXfs);
this.minimizeXfs(oNewXfs);
// При открытии стиль будет ссылкой
......@@ -6756,7 +6757,7 @@
{
res = this.stream.Seek(nStyleTableOffset);
if(c_oSerConstants.ReadOk == res)
res = (new Binary_StylesTableReader(this.stream, wb, aCellXfs, aDxfs)).Read();
res = (new Binary_StylesTableReader(this.stream, wb, aCellXfs, aDxfs, this.copyPasteObj.isCopyPaste)).Read();
}
if(c_oSerConstants.ReadOk == res)
{
......
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