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

(1.0.0.79): XlsxSerializerCom

сохранение/открытие внутренней структуры комментария в xlsx.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50758 954022d7-b5bf-4e40-9824-e11837661b57
parent 1da6c8f9
...@@ -3248,13 +3248,13 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, aDxfs, aXfs, aF ...@@ -3248,13 +3248,13 @@ function BinaryWorksheetsTableWriter(memory, wb, oSharedStrings, aDxfs, aXfs, aF
this.memory.WriteByte(c_oSer_CommentData.UserName); this.memory.WriteByte(c_oSer_CommentData.UserName);
this.memory.WriteString2(sUserName); this.memory.WriteString2(sUserName);
} }
var sQuoteText = null; var sQuoteText = oCommentData.asc_getQuoteText();
if(null != sQuoteText) if(null != sQuoteText)
{ {
this.memory.WriteByte(c_oSer_CommentData.QuoteText); this.memory.WriteByte(c_oSer_CommentData.QuoteText);
this.memory.WriteString2(sQuoteText); this.memory.WriteString2(sQuoteText);
} }
var bSolved = null; var bSolved = oCommentData.asc_getSolved();
if(null != bSolved) if(null != bSolved)
this.bs.WriteItem( c_oSer_CommentData.Solved, function(){oThis.memory.WriteBool(bSolved);}); this.bs.WriteItem( c_oSer_CommentData.Solved, function(){oThis.memory.WriteBool(bSolved);});
var bDocumentFlag = oCommentData.asc_getDocumentFlag(); var bDocumentFlag = oCommentData.asc_getDocumentFlag();
...@@ -5720,6 +5720,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs, ...@@ -5720,6 +5720,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
if ( c_oSer_Comments.CommentData === type ) if ( c_oSer_Comments.CommentData === type )
{ {
var oCommentData = new Asc.asc_CCommentData(); var oCommentData = new Asc.asc_CCommentData();
oCommentData.asc_putDocumentFlag(false);
res = this.bcr.Read1(length, function(t,l){ res = this.bcr.Read1(length, function(t,l){
return oThis.ReadCommentData(t,l,oCommentData); return oThis.ReadCommentData(t,l,oCommentData);
}); });
...@@ -5746,9 +5747,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs, ...@@ -5746,9 +5747,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
else if ( c_oSer_CommentData.UserName == type ) else if ( c_oSer_CommentData.UserName == type )
oCommentData.asc_putUserName(this.stream.GetString2LE(length)); oCommentData.asc_putUserName(this.stream.GetString2LE(length));
else if ( c_oSer_CommentData.QuoteText == type ) else if ( c_oSer_CommentData.QuoteText == type )
{ oCommentData.asc_putQuoteText(this.stream.GetString2LE(length));
var sQuoteText = this.stream.GetString2LE(length);
}
else if ( c_oSer_CommentData.Replies == type ) else if ( c_oSer_CommentData.Replies == type )
{ {
res = this.bcr.Read1(length, function(t,l){ res = this.bcr.Read1(length, function(t,l){
...@@ -5756,9 +5755,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs, ...@@ -5756,9 +5755,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
}); });
} }
else if ( c_oSer_CommentData.Solved == type ) else if ( c_oSer_CommentData.Solved == type )
{ oCommentData.asc_putSolved(this.stream.GetBool());
var bSolved = this.stream.GetBool();
}
else if ( c_oSer_CommentData.Document == type ) else if ( c_oSer_CommentData.Document == type )
oCommentData.asc_putDocumentFlag(this.stream.GetBool()); oCommentData.asc_putDocumentFlag(this.stream.GetBool());
else else
...@@ -6028,6 +6025,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs, ...@@ -6028,6 +6025,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
if ( c_oSer_CommentData.Reply === type ) if ( c_oSer_CommentData.Reply === type )
{ {
var oReplyData = new Asc.asc_CCommentData(); var oReplyData = new Asc.asc_CCommentData();
oReplyData.asc_putDocumentFlag(false);
res = this.bcr.Read1(length, function(t,l){ res = this.bcr.Read1(length, function(t,l){
return oThis.ReadCommentData(t,l,oReplyData); return oThis.ReadCommentData(t,l,oReplyData);
}); });
......
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