Commit 5b1016b8 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 26121 - Курсор устанавливается внутри заголовка диаграммы, если он выходит за границы диаграммы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58523 954022d7-b5bf-4e40-9824-e11837661b57
parent de667c7d
...@@ -205,6 +205,8 @@ function handleGroup(drawing, drawingObjectsController, e, x, y, group, pageInde ...@@ -205,6 +205,8 @@ function handleGroup(drawing, drawingObjectsController, e, x, y, group, pageInde
case historyitem_type_ChartSpace: case historyitem_type_ChartSpace:
{ {
var ret, i, title; var ret, i, title;
if(cur_grouped_object.hit(x, y))
{
var chart_titles = cur_grouped_object.getAllTitles(); var chart_titles = cur_grouped_object.getAllTitles();
for(i = 0; i < chart_titles.length; ++i) for(i = 0; i < chart_titles.length; ++i)
{ {
...@@ -269,6 +271,7 @@ function handleGroup(drawing, drawingObjectsController, e, x, y, group, pageInde ...@@ -269,6 +271,7 @@ function handleGroup(drawing, drawingObjectsController, e, x, y, group, pageInde
} }
} }
} }
}
ret = handleShapeImageInGroup(drawingObjectsController, drawing, cur_grouped_object, e, x, y, pageIndex, bWord); ret = handleShapeImageInGroup(drawingObjectsController, drawing, cur_grouped_object, e, x, y, pageIndex, bWord);
if(ret) if(ret)
return ret; return ret;
...@@ -282,6 +285,8 @@ function handleGroup(drawing, drawingObjectsController, e, x, y, group, pageInde ...@@ -282,6 +285,8 @@ function handleGroup(drawing, drawingObjectsController, e, x, y, group, pageInde
function handleChart(drawing, drawingObjectsController, e, x, y, group, pageIndex, bWord) function handleChart(drawing, drawingObjectsController, e, x, y, group, pageIndex, bWord)
{ {
var ret, i, title; var ret, i, title;
if(drawing.hit(x, y))
{
var chart_titles = drawing.getAllTitles(); var chart_titles = drawing.getAllTitles();
var selector = group ? group : drawingObjectsController; var selector = group ? group : drawingObjectsController;
for(i = 0; i < chart_titles.length; ++i) for(i = 0; i < chart_titles.length; ++i)
...@@ -344,6 +349,8 @@ function handleChart(drawing, drawingObjectsController, e, x, y, group, pageInde ...@@ -344,6 +349,8 @@ function handleChart(drawing, drawingObjectsController, e, x, y, group, pageInde
} }
} }
}
ret = handleShapeImage(drawing, drawingObjectsController, e, x, y, group, pageIndex, bWord); ret = handleShapeImage(drawing, drawingObjectsController, e, x, y, group, pageIndex, bWord);
if(ret) if(ret)
return ret; return ret;
...@@ -377,6 +384,8 @@ function handleInlineShapeImage(drawing, drawingObjectsController, e, x, y, page ...@@ -377,6 +384,8 @@ function handleInlineShapeImage(drawing, drawingObjectsController, e, x, y, page
function handleInlineChart(drawing, drawingObjectsController, e, x, y, pageIndex) function handleInlineChart(drawing, drawingObjectsController, e, x, y, pageIndex)
{ {
if(drawing.hit(x, y))
{
var ret, i, title; var ret, i, title;
var chart_titles = drawing.getAllTitles(); var chart_titles = drawing.getAllTitles();
for(i = 0; i < chart_titles.length; ++i) for(i = 0; i < chart_titles.length; ++i)
...@@ -438,6 +447,7 @@ function handleInlineChart(drawing, drawingObjectsController, e, x, y, pageIndex ...@@ -438,6 +447,7 @@ function handleInlineChart(drawing, drawingObjectsController, e, x, y, pageIndex
} }
} }
} }
}
return handleInlineShapeImage(drawing, drawingObjectsController, e, x, y, pageIndex); return handleInlineShapeImage(drawing, drawingObjectsController, e, x, y, pageIndex);
} }
......
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