Commit 0b7fd45d 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@66759 954022d7-b5bf-4e40-9824-e11837661b57
parent ce975599
...@@ -602,7 +602,16 @@ CChartSpace.prototype = ...@@ -602,7 +602,16 @@ CChartSpace.prototype =
if(this.selection.textSelection) if(this.selection.textSelection)
{ {
this.selection.textSelection.checkDocContent(); this.selection.textSelection.checkDocContent();
var bTrackRevision = false;
if(typeof editor !== "undefined" && editor && editor.WordControl && editor.WordControl.m_oLogicDocument.TrackRevisions === true){
bTrackRevision = true;
editor.WordControl.m_oLogicDocument.TrackRevisions = false;
}
this.selection.textSelection.applyTextFunction(docContentFunction, tableFunction, args); this.selection.textSelection.applyTextFunction(docContentFunction, tableFunction, args);
if(bTrackRevision){
editor.WordControl.m_oLogicDocument.TrackRevisions = true;
}
} }
}, },
......
...@@ -123,8 +123,17 @@ CTextBody.prototype = ...@@ -123,8 +123,17 @@ CTextBody.prototype =
ret.setBodyPr(this.bodyPr.createDuplicate()); ret.setBodyPr(this.bodyPr.createDuplicate());
if(this.lstStyle) if(this.lstStyle)
ret.setLstStyle(this.lstStyle.createDuplicate()); ret.setLstStyle(this.lstStyle.createDuplicate());
if(this.content) if(this.content){
var bTrackRevision = false;
if(typeof editor !== "undefined" && editor && editor.WordControl && editor.WordControl.m_oLogicDocument.TrackRevisions === true){
bTrackRevision= true;
editor.WordControl.m_oLogicDocument.TrackRevisions = false;
}
ret.setContent(this.content.Copy3(ret)); ret.setContent(this.content.Copy3(ret));
if(bTrackRevision){
editor.WordControl.m_oLogicDocument.TrackRevisions = true;
}
}
return ret; return ret;
}, },
......
...@@ -2942,7 +2942,13 @@ PasteProcessor.prototype = ...@@ -2942,7 +2942,13 @@ PasteProcessor.prototype =
// } // }
// }); // });
// return; // return;
var bTurnOffTrackRevisions = false;
if(this.oDocument && this.oDocument.bPresentation){
if(oThis.api.WordControl.m_oLogicDocument.TrackRevisions){
oThis.api.WordControl.m_oLogicDocument.TrackRevisions = false;
bTurnOffTrackRevisions = true;
}
}
if(copyPasteUseBinary) if(copyPasteUseBinary)
{ {
if(onlyBinary) if(onlyBinary)
...@@ -3045,7 +3051,9 @@ PasteProcessor.prototype = ...@@ -3045,7 +3051,9 @@ PasteProcessor.prototype =
this.aContent = aContent.content; this.aContent = aContent.content;
oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback); oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback);
} }
if(bTurnOffTrackRevisions){
oThis.api.WordControl.m_oLogicDocument.TrackRevisions = true;
}
return; return;
} }
else if(pasteFromBinary)//вставка из редактора документов else if(pasteFromBinary)//вставка из редактора документов
...@@ -3099,6 +3107,9 @@ PasteProcessor.prototype = ...@@ -3099,6 +3107,9 @@ PasteProcessor.prototype =
{ {
oThis.SetShortImageId(aContent.aPastedImages); oThis.SetShortImageId(aContent.aPastedImages);
oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback); oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback);
}
if(bTurnOffTrackRevisions){
oThis.api.WordControl.m_oLogicDocument.TrackRevisions = true;
} }
return; return;
} }
...@@ -3145,6 +3156,9 @@ PasteProcessor.prototype = ...@@ -3145,6 +3156,9 @@ PasteProcessor.prototype =
this.aContent = aContent; this.aContent = aContent;
oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback); oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback);
if(bTurnOffTrackRevisions){
oThis.api.WordControl.m_oLogicDocument.TrackRevisions = true;
}
return; return;
} }
case "Drawings": case "Drawings":
...@@ -3217,6 +3231,9 @@ PasteProcessor.prototype = ...@@ -3217,6 +3231,9 @@ PasteProcessor.prototype =
oThis.aContent = aContent.content; oThis.aContent = aContent.content;
oThis.api.pre_Paste(aContent.fonts, image_map, fPrepasteCallback); oThis.api.pre_Paste(aContent.fonts, image_map, fPrepasteCallback);
}); });
if(bTurnOffTrackRevisions){
oThis.api.WordControl.m_oLogicDocument.TrackRevisions = true;
}
return; return;
} }
} }
...@@ -3263,7 +3280,9 @@ PasteProcessor.prototype = ...@@ -3263,7 +3280,9 @@ PasteProcessor.prototype =
} }
} }
} }
if(bTurnOffTrackRevisions){
oThis.api.WordControl.m_oLogicDocument.TrackRevisions = false;
}
//�� ����� ���������� �������� ��� ������� ��������� ������� //�� ����� ���������� �������� ��� ������� ��������� �������
oThis._Execute(node, {}, true, true, false); oThis._Execute(node, {}, true, true, false);
...@@ -3274,7 +3293,13 @@ PasteProcessor.prototype = ...@@ -3274,7 +3293,13 @@ PasteProcessor.prototype =
nodeDisplay.blur(); nodeDisplay.blur();
nodeDisplay.style.display = ELEMENT_DISPAY_STYLE; nodeDisplay.style.display = ELEMENT_DISPAY_STYLE;
} }
if(bTurnOffTrackRevisions){
oThis.api.WordControl.m_oLogicDocument.TrackRevisions = true;
}
}); });
if(bTurnOffTrackRevisions){
oThis.api.WordControl.m_oLogicDocument.TrackRevisions = true;
}
} }
else//presentation else//presentation
{ {
......
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