Commit 6a01aae9 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 25452 - Не отменяется вырезание текста в заголовке диаграммы в колонтитуле

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57513 954022d7-b5bf-4e40-9824-e11837661b57
parent c5efd482
...@@ -3922,6 +3922,8 @@ DrawingObjectsController.prototype = ...@@ -3922,6 +3922,8 @@ DrawingObjectsController.prototype =
checkChartTextSelection: function() checkChartTextSelection: function()
{ {
if(this.bNoCheckChartTextSelection === true)
return;
var chart_selection; var chart_selection;
if(this.selection.chartSelection) if(this.selection.chartSelection)
{ {
......
...@@ -11573,8 +11573,10 @@ CDocument.prototype = ...@@ -11573,8 +11573,10 @@ CDocument.prototype =
return; return;
this.DrawingDocument.EndTrackTable( null, true ); this.DrawingDocument.EndTrackTable( null, true );
this.DrawingObjects.TurnOffCheckChartSelection();
this.History.Undo(); this.History.Undo();
this.DrawingObjects.TurnOnCheckChartSelection();
this.Recalculate( false, false, this.History.RecalculateData ); this.Recalculate( false, false, this.History.RecalculateData );
this.Document_UpdateSelectionState(); this.Document_UpdateSelectionState();
...@@ -11587,8 +11589,10 @@ CDocument.prototype = ...@@ -11587,8 +11589,10 @@ CDocument.prototype =
return; return;
this.DrawingDocument.EndTrackTable( null, true ); this.DrawingDocument.EndTrackTable( null, true );
this.DrawingObjects.TurnOffCheckChartSelection();
this.History.Redo(); this.History.Redo();
this.DrawingObjects.TurnOnCheckChartSelection();
this.Recalculate( false, false, this.History.RecalculateData ); this.Recalculate( false, false, this.History.RecalculateData );
this.Document_UpdateSelectionState(); this.Document_UpdateSelectionState();
......
...@@ -60,6 +60,7 @@ function CGraphicObjects(document, drawingDocument, api, documentContent) ...@@ -60,6 +60,7 @@ function CGraphicObjects(document, drawingDocument, api, documentContent)
this.handleEventMode = HANDLE_EVENT_MODE_HANDLE; this.handleEventMode = HANDLE_EVENT_MODE_HANDLE;
this.nullState = new NullState(this); this.nullState = new NullState(this);
this.bNoCheckChartTextSelection = false;
this.Id = g_oIdCounter.Get_NewId(); this.Id = g_oIdCounter.Get_NewId();
this.Lock = new CLock(); this.Lock = new CLock();
...@@ -83,6 +84,16 @@ CGraphicObjects.prototype = ...@@ -83,6 +84,16 @@ CGraphicObjects.prototype =
return this.Id; return this.Id;
}, },
TurnOffCheckChartSelection: function()
{
this.bNoCheckChartTextSelection = true;
},
TurnOnCheckChartSelection: function()
{
this.bNoCheckChartTextSelection = false;
},
sortDrawingArrays: function() sortDrawingArrays: function()
{ {
for(var i = 0; i < this.graphicPages.length; ++i) for(var i = 0; i < this.graphicPages.length; ++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