Commit 291bf469 authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

поправила баг на заливке 56659 (mcJc)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56676 954022d7-b5bf-4e40-9824-e11837661b57
parent 54308e7f
......@@ -401,10 +401,10 @@ CMathMatrix.prototype.setProperties = function(props)
{
this.setCtrPrp(props.ctrPrp);
if(typeof(props.row) !== "undefined" || props.row !== null)
if(typeof(props.row) !== "undefined" && props.row !== null)
this.nRow = props.row;
if(typeof(props.column) !== "undefined" || props.column !== null)
if(typeof(props.column) !== "undefined" && props.column !== null)
this.nCol = props.column;
if(props.plcHide === true || props.plcHide === 1)
......@@ -414,7 +414,7 @@ CMathMatrix.prototype.setProperties = function(props)
this.Pr.baseJc = props.baseJc;
if(props.mcJc.constructor.name == "Array" && props.mcJc.length == props.column)
if(typeof(props.mcJc) !== "undefined" && props.mcJc !== null && props.mcJc.constructor.name == "Array" && props.mcJc.length == props.column)
{
for(var i = 0; i < this.nCol; i++)
{
......
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