Commit 411d5c14 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin

исправлен неправильный подсчет bounds у диаграмм

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57303 954022d7-b5bf-4e40-9824-e11837661b57
parent b278b43b
...@@ -467,14 +467,13 @@ DrawingObjectsController.prototype = ...@@ -467,14 +467,13 @@ DrawingObjectsController.prototype =
{ {
if(this.handleEventMode === HANDLE_EVENT_MODE_HANDLE) if(this.handleEventMode === HANDLE_EVENT_MODE_HANDLE)
{ {
if(e.CtrlKey) if(e.CtrlKey && !this.document)
{ {
var target_content = this.getTargetDocContent(); var target_content = this.getTargetDocContent();
if(!target_content) if(!target_content)
{ {
return this.handleMoveHit(object, e, x, y, group, false, pageIndex, bWord); return this.handleMoveHit(object, e, x, y, group, false, pageIndex, bWord);
} }
} }
this.resetSelection(); this.resetSelection();
(group ? group : this).selectObject(object,pageIndex); (group ? group : this).selectObject(object,pageIndex);
......
...@@ -7525,6 +7525,17 @@ CChartSpace.prototype = ...@@ -7525,6 +7525,17 @@ CChartSpace.prototype =
{ {
/*this.setRecalculateInfo(); /*this.setRecalculateInfo();
this.recalculate();*/ this.recalculate();*/
if(graphics.IsSlideBoundsCheckerType)
{
graphics.transform3(this.transform);
graphics._s();
graphics._m(0, 0);
graphics._l(this.extX, 0);
graphics._l(this.extX, this.extY);
graphics._l(0, this.extY);
graphics._e();
return;
}
if(graphics.updatedRect) if(graphics.updatedRect)
{ {
var rect = graphics.updatedRect; var rect = graphics.updatedRect;
...@@ -7538,6 +7549,8 @@ CChartSpace.prototype = ...@@ -7538,6 +7549,8 @@ CChartSpace.prototype =
var pix= 3*this.convertPixToMM(1); var pix= 3*this.convertPixToMM(1);
var intGrid = graphics.GetIntegerGrid(); var intGrid = graphics.GetIntegerGrid();
graphics.SaveGrState(); graphics.SaveGrState();
......
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