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

add cellPr param textDirection

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68233 954022d7-b5bf-4e40-9824-e11837661b57
parent 8d211e69
...@@ -246,7 +246,8 @@ var c_oSerProp_cellPrType = { ...@@ -246,7 +246,8 @@ var c_oSerProp_cellPrType = {
CellDel: 7, CellDel: 7,
CellIns: 8, CellIns: 8,
CellMerge: 9, CellMerge: 9,
tcPrChange: 10 tcPrChange: 10,
textDirection: 11
}; };
var c_oSerProp_secPrType = { var c_oSerProp_secPrType = {
pgSz: 0, pgSz: 0,
...@@ -3402,7 +3403,7 @@ Binary_tblPrWriter.prototype = ...@@ -3402,7 +3403,7 @@ Binary_tblPrWriter.prototype =
} }
} }
}, },
WriteCellPr: function(cellPr, vMerge) WriteCellPr: function(cellPr, vMerge, cell)
{ {
var oThis = this; var oThis = this;
//GridSpan //GridSpan
...@@ -3459,6 +3460,13 @@ Binary_tblPrWriter.prototype = ...@@ -3459,6 +3460,13 @@ Binary_tblPrWriter.prototype =
this.memory.WriteByte(c_oSerPropLenType.Byte); this.memory.WriteByte(c_oSerPropLenType.Byte);
this.memory.WriteByte(nVMerge); this.memory.WriteByte(nVMerge);
} }
var textDirection = cell ? cell.Get_TextDirection() : null;
if(null != textDirection)
{
this.memory.WriteByte(c_oSerProp_cellPrType.textDirection);
this.memory.WriteByte(c_oSerPropLenType.Byte);
this.memory.WriteByte(textDirection);
}
} }
}; };
function BinaryHeaderFooterTableWriter(memory, doc, oNumIdMap, oMapCommentId, saveParams) function BinaryHeaderFooterTableWriter(memory, doc, oNumIdMap, oMapCommentId, saveParams)
...@@ -4548,7 +4556,7 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa ...@@ -4548,7 +4556,7 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
if(table.Internal_GetVertMergeCount( nRowIndex, StartGridCol, cell.Get_GridSpan() ) > 1) if(table.Internal_GetVertMergeCount( nRowIndex, StartGridCol, cell.Get_GridSpan() ) > 1)
vMerge = vmerge_Restart; vMerge = vmerge_Restart;
} }
this.bs.WriteItem(c_oSerDocTableType.Cell_Pr, function(){oThis.btblPrs.WriteCellPr(cell.Pr, vMerge);}); this.bs.WriteItem(c_oSerDocTableType.Cell_Pr, function(){oThis.btblPrs.WriteCellPr(cell.Pr, vMerge, cell);});
} }
//Content //Content
if(null != cell.Content) if(null != cell.Content)
...@@ -7363,6 +7371,9 @@ Binary_tblPrReader.prototype = ...@@ -7363,6 +7371,9 @@ Binary_tblPrReader.prototype =
else if( c_oSerProp_cellPrType.tcPrChange === type ){ else if( c_oSerProp_cellPrType.tcPrChange === type ){
res = c_oSerConstants.ReadUnknown;//todo res = c_oSerConstants.ReadUnknown;//todo
} }
else if( c_oSerProp_cellPrType.textDirection === type ){
Pr.TextDirection = this.stream.GetUChar();
}
else else
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return 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