Commit 42b0abce authored by SergeyLuzyanin's avatar SergeyLuzyanin

fix Bug 35157

parent 8a6acdff
...@@ -5383,6 +5383,23 @@ CShape.prototype.getColumnNumber = function(){ ...@@ -5383,6 +5383,23 @@ CShape.prototype.getColumnNumber = function(){
}; };
CShape.prototype.checkWrap = function(){
if(!this.txBody){
return;
}
var new_body_pr = this.getBodyPr();
if (new_body_pr) {
if(new_body_pr.numCol > 1){
if(new_body_pr.wrap === AscFormat.nTWTNone){
new_body_pr = new_body_pr.createDuplicate();
new_body_pr.wrap = AscFormat.nTWTSquare;
this.txBody.setBodyPr(new_body_pr);
}
}
}
};
CShape.prototype.setColumnNumber = function(num){ CShape.prototype.setColumnNumber = function(num){
if(!this.bWordShape && !CheckObjectLine(this)){ if(!this.bWordShape && !CheckObjectLine(this)){
var new_body_pr = this.getBodyPr(); var new_body_pr = this.getBodyPr();
...@@ -5396,7 +5413,7 @@ CShape.prototype.getColumnNumber = function(){ ...@@ -5396,7 +5413,7 @@ CShape.prototype.getColumnNumber = function(){
if (this.txBody) { if (this.txBody) {
this.txBody.setBodyPr(new_body_pr); this.txBody.setBodyPr(new_body_pr);
} }
this.checkWrap();
} }
} }
...@@ -5414,6 +5431,7 @@ CShape.prototype.getColumnNumber = function(){ ...@@ -5414,6 +5431,7 @@ CShape.prototype.getColumnNumber = function(){
if (this.txBody) { if (this.txBody) {
this.txBody.setBodyPr(new_body_pr); this.txBody.setBodyPr(new_body_pr);
} }
this.checkWrap();
} }
} }
}; };
......
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