Commit 47108b08 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Проблема со вставкой из редактора таблиц

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56387 954022d7-b5bf-4e40-9824-e11837661b57
parent 7897c516
......@@ -274,7 +274,7 @@ CShape.prototype.recalculateTxBoxContent = function()
CShape.prototype.recalculate = function ()
{
if(this.bDeleted)
if(this.bDeleted || !this.bWordShape)
return;
ExecuteNoHistory(function()
{
......@@ -318,6 +318,8 @@ CShape.prototype.recalculate = function ()
CShape.prototype.recalculateText = function()
{
if(!this.bWordShape)
return;
ExecuteNoHistory(function()
{
if(this.bWordShape)
......@@ -506,6 +508,7 @@ CShape.prototype.recalculateShapeStyleForParagraph = function()
{
var styles = editor.WordControl.m_oLogicDocument.Styles;
this.textStyleForParagraph = {TextPr: styles.Default.TextPr.Copy(), ParaPr: styles.Default.ParaPr.Copy()};
//this.textStyleForParagraph.ParaPr.Spacing.Line = 1;
this.textStyleForParagraph.TextPr.Color.Auto = false;
if(this.style && this.style.fontRef)
{
......
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