Commit 984d9ca1 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@53729 954022d7-b5bf-4e40-9824-e11837661b57
parent 53eaa4b0
This diff is collapsed.
...@@ -1272,8 +1272,6 @@ CPresentation.prototype = ...@@ -1272,8 +1272,6 @@ CPresentation.prototype =
} }
}, },
Add_FlowImage : function(W, H, Img) Add_FlowImage : function(W, H, Img)
{ {
this.Slides[this.CurPage].graphicObjects.Add_FlowImage(W, H, Img); this.Slides[this.CurPage].graphicObjects.Add_FlowImage(W, H, Img);
...@@ -6129,6 +6127,25 @@ CPresentation.prototype = ...@@ -6129,6 +6127,25 @@ CPresentation.prototype =
editor.WordControl.m_oLogicDocument.recalcMap[slide.Id] = slide; editor.WordControl.m_oLogicDocument.recalcMap[slide.Id] = slide;
}, },
moveSlides: function(slidesIndexes, pos)
{
var insert_pos = pos;
var removed_slides = [];
for(var i = slidesIndexes.length - 1; i > -1; --i)
{
removed_slides.push(this.removeSlide(slidesIndexes[i]));
if(slidesIndexes[i] < pos)
{
--insert_pos;
}
}
removed_slides.reverse();
for(i = 0; i < removed_slides.length; ++i)
{
this.insertSlide(insert_pos + i, removed_slides[i]);
}
},
changeTheme2 : function(themeInfo, arrInd) changeTheme2 : function(themeInfo, arrInd)
......
...@@ -2737,7 +2737,7 @@ CGraphicObjects.prototype = { ...@@ -2737,7 +2737,7 @@ CGraphicObjects.prototype = {
{ {
if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_AddShape, chart) === false) if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_AddShape, chart) === false)
{ {
oThis.slide.addToSpTreeToPos(oThis.slide.cSld.spTree, chart); oThis.slide.addToSpTreeToPos(oThis.slide.cSld.spTree.length, chart);
editor.WordControl.m_oLogicDocument.recalcMap[chart.Id] = chart; editor.WordControl.m_oLogicDocument.recalcMap[chart.Id] = chart;
editor.WordControl.m_oLogicDocument.Recalculate(); editor.WordControl.m_oLogicDocument.Recalculate();
} }
......
...@@ -109,8 +109,6 @@ function NewShapeTrack(drawingObjects, presetGeom, startX, startY) ...@@ -109,8 +109,6 @@ function NewShapeTrack(drawingObjects, presetGeom, startX, startY)
} }
if(!(e.CtrlKey || e.ShiftKey) || (e.CtrlKey && !e.ShiftKey && this.isLine)) if(!(e.CtrlKey || e.ShiftKey) || (e.CtrlKey && !e.ShiftKey && this.isLine))
{ {
this.extX = abs_dist_x >= MIN_SHAPE_SIZE ? abs_dist_x : (this.isLine ? 0 : MIN_SHAPE_SIZE); this.extX = abs_dist_x >= MIN_SHAPE_SIZE ? abs_dist_x : (this.isLine ? 0 : MIN_SHAPE_SIZE);
this.extY = abs_dist_y >= MIN_SHAPE_SIZE ? abs_dist_y : (this.isLine ? 0 : MIN_SHAPE_SIZE); this.extY = abs_dist_y >= MIN_SHAPE_SIZE ? abs_dist_y : (this.isLine ? 0 : MIN_SHAPE_SIZE);
if(real_dist_x >= 0) if(real_dist_x >= 0)
......
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