Commit df821261 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

возможность отключать smart-отрисовку в shapedrawer

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68425 954022d7-b5bf-4e40-9824-e11837661b57
parent a9c758fa
...@@ -193,7 +193,9 @@ CChartsDrawer.prototype = ...@@ -193,7 +193,9 @@ CChartsDrawer.prototype =
this.gridChart.draw(this); this.gridChart.draw(this);
} }
this.cShapeDrawer.bIsNoSmartAttack = true;
this.chart.draw(this); this.chart.draw(this);
this.cShapeDrawer.bIsNoSmartAttack = false;
if(this.calcProp.type != "Pie" && this.calcProp.type != "DoughnutChart") if(this.calcProp.type != "Pie" && this.calcProp.type != "DoughnutChart")
{ {
......
...@@ -1009,7 +1009,7 @@ Path.prototype = { ...@@ -1009,7 +1009,7 @@ Path.prototype = {
var _graphics = shape_drawer.Graphics; var _graphics = shape_drawer.Graphics;
var _full_trans = _graphics.m_oFullTransform; var _full_trans = _graphics.m_oFullTransform;
if (!_graphics || !_full_trans || undefined == _graphics.m_bIntegerGrid) if (!_graphics || !_full_trans || undefined == _graphics.m_bIntegerGrid || true === shape_drawer.bIsNoSmartAttack)
return this.draw(shape_drawer); return this.draw(shape_drawer);
var bIsTransformed = (_full_trans.shx == 0 && _full_trans.shy == 0) ? false : true; var bIsTransformed = (_full_trans.shx == 0 && _full_trans.shy == 0) ? false : true;
......
...@@ -97,6 +97,7 @@ var editor; ...@@ -97,6 +97,7 @@ var editor;
this.formulasList = getFormulasInfo(); this.formulasList = getFormulasInfo();
// ToDo нужно ли это // ToDo нужно ли это
asc['editor'] = ( asc['editor'] || this ); asc['editor'] = ( asc['editor'] || this );
AscBrowser.checkZoom();
}; };
spreadsheet_api.prototype.asc_CheckGuiControlColors = function() { spreadsheet_api.prototype.asc_CheckGuiControlColors = function() {
......
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