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

add column break;

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@67886 954022d7-b5bf-4e40-9824-e11837661b57
parent 9680493a
...@@ -323,7 +323,8 @@ var c_oSerRunType = { ...@@ -323,7 +323,8 @@ var c_oSerRunType = {
object: 14, object: 14,
delText: 15, delText: 15,
del: 16, del: 16,
ins: 17 ins: 17,
columnbreak: 18
}; };
var c_oSerImageType = { var c_oSerImageType = {
MediaId:0, MediaId:0,
...@@ -642,7 +643,8 @@ var c_oSer_OMathContentType = { ...@@ -642,7 +643,8 @@ var c_oSer_OMathContentType = {
linebreak: 60, linebreak: 60,
Run: 61, Run: 61,
Ins: 62, Ins: 62,
Del: 63 Del: 63,
columnbreak: 64
}; };
var c_oSer_HyperlinkType = { var c_oSer_HyperlinkType = {
Content: 0, Content: 0,
...@@ -4092,10 +4094,17 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa ...@@ -4092,10 +4094,17 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
break; break;
case para_NewLine: case para_NewLine:
sCurText = this.WriteText(sCurText, delText); sCurText = this.WriteText(sCurText, delText);
if (break_Page == item.BreakType) switch (item.BreakType) {
oThis.memory.WriteByte(c_oSerRunType.pagebreak); case break_Column:
else oThis.memory.WriteByte(c_oSerRunType.columnbreak);
oThis.memory.WriteByte(c_oSerRunType.linebreak); break;
case break_Page:
oThis.memory.WriteByte(c_oSerRunType.pagebreak);
break;
default:
oThis.memory.WriteByte(c_oSerRunType.linebreak);
break;
}
oThis.memory.WriteLong(c_oSerPropLenType.Null); oThis.memory.WriteLong(c_oSerPropLenType.Null);
break; break;
case para_Drawing: case para_Drawing:
...@@ -8188,6 +8197,10 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow ...@@ -8188,6 +8197,10 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
{ {
oNewElem = new ParaNewLine( break_Line ); oNewElem = new ParaNewLine( break_Line );
} }
else if (c_oSerRunType.columnbreak === type)
{
oNewElem = new ParaNewLine( break_Column );
}
else if(c_oSerRunType.image === type) else if(c_oSerRunType.image === type)
{ {
var oThis = this; var oThis = this;
...@@ -9051,6 +9064,10 @@ function Binary_oMathReader(stream, oReadResult) ...@@ -9051,6 +9064,10 @@ function Binary_oMathReader(stream, oReadResult)
{ {
oNewElem = new ParaNewLine( break_Line ); oNewElem = new ParaNewLine( break_Line );
} }
else if (c_oSerRunType.columnbreak === type)
{
oNewElem = new ParaNewLine( break_Column );
}
else if (c_oSerRunType._LastRun === type) else if (c_oSerRunType._LastRun === type)
this.oReadResult.bLastRun = true; this.oReadResult.bLastRun = true;
else else
...@@ -10529,6 +10546,10 @@ function Binary_oMathReader(stream, oReadResult) ...@@ -10529,6 +10546,10 @@ function Binary_oMathReader(stream, oReadResult)
else if (c_oSer_OMathContentType.linebreak === type) else if (c_oSer_OMathContentType.linebreak === type)
{ {
oNewElem = new ParaNewLine(); oNewElem = new ParaNewLine();
}
else if (c_oSer_OMathContentType.columnbreak === type)
{
oNewElem = new ParaNewLine( break_Column );
} else if (c_oSer_OMathContentType.Del === type) { } else if (c_oSer_OMathContentType.Del === type) {
var reviewInfo = new CReviewInfo(); var reviewInfo = new CReviewInfo();
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
......
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