Skip to content

S
sdkjs
Commit 2126093e authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

Различные баги 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56842 954022d7-b5bf-4e40-9824-e11837661b57
parent 34cd560f
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 112 deletions
Excel/model/DrawingObjects/Format/ChartSpacePrototype.js
View file @ 2126093e
......@@ -104,16 +104,11 @@ CChartSpace.prototype.handleUpdatePosition = function()
};
CChartSpace.prototype.handleUpdateExtents = function()
{
this.recalcInfo.recalculateChart = true;
this.recalcInfo.recalculateSeriesColors = true;
this.recalcInfo.recalculateDLbls = true;
this.recalcInfo.recalculateAxisLabels = true;
this.recalcInfo.dataLbls.length = 0;
this.recalcInfo.axisLabels.length = 0;
this.recalcInfo.recalculateAxisVal = true;
this.recalcInfo.recalculateLegend = true;
this.chartObj = null;
this.addToRecalculate();
this.recalcChart();
this.recalcBounds();
this.recalcTransform();
this.recalcTitles();
this.handleUpdateInternalChart();
};
CChartSpace.prototype.handleUpdateFlip = function()
{
......@@ -215,12 +210,7 @@ CChartSpace.prototype.recalculate = function()
if(this.recalcInfo.recalcTitle)
{
var pos_x, pos_y;
pos_x = this.recalcInfo.recalcTitle.x;
pos_y = this.recalcInfo.recalcTitle.y;
var pos_cx = pos_x + this.recalcInfo.recalcTitle.extX/2;
this.recalculateAxisLabels();
this.recalcInfo.recalcTitle.setPosition(pos_cx - this.recalcInfo.recalcTitle.extX/2, pos_y);
this.recalculateChartTitleEditMode();
this.recalcInfo.recalcTitle = null;
this.recalcInfo.bRecalculatedTitle = true;
}
......
Excel/model/History.js
View file @ 2126093e
......@@ -114,101 +114,6 @@ var historyitem_Chart_LegendPosition = 60;
var historyitem_Chart_LegendIsShow = 61;
var historyitem_Chart_LegendIsOverlay = 62;
// AutoShapes
var historyitem_AutoShapes_Offset = 1;
var historyitem_AutoShapes_Extents = 2;
var historyitem_AutoShapes_Child_Offset = 3;
var historyitem_AutoShapes_Child_Extents = 4;
var historyitem_AutoShapes_Rotate = 5;
var historyitem_AutoShapes_Flips = 6;
var historyitem_AutoShapes_SetGuideValue = 7;
var historyitem_AutoShapes_RecalculateTransformUndo = 8;
var historyitem_AutoShapes_RecalculateTransformRedo = 9;
var historyitem_AutoShapes_Add_Adjustment = 10;
var historyitem_AutoShapes_Add_Guide = 11;
var historyitem_AutoShapes_Add_Cnx = 12;
var historyitem_AutoShapes_Add_Handle_XY = 13;
var historyitem_AutoShapes_Add_Handle_Polar = 14;
var historyitem_AutoShapes_Add_Path_Command = 15;
var historyitem_AutoShapes_Add_Path = 16;
var historyitem_AutoShapes_Add_GeometryRect = 17;
var historyitem_AutoShapes_Add_PathMoveTo = 18;
var historyitem_AutoShapes_Add_PathLineTo = 19;
var historyitem_AutoShapes_Add_PathArcTo = 20;
var historyitem_AutoShapes_Add_PathQuadBezTo = 21;
var historyitem_AutoShapes_Add_PathCubicBezTo = 22;
var historyitem_AutoShapes_Add_PathClose = 23;
var historyitem_AutoShapes_RecalculateGeometry_Undo = 24;
var historyitem_AutoShapes_RecalculateGeometry_Redo = 25;
var historyitem_AutoShapes_Add_To_Drawing_Objects = 26;
var historyitem_AutoShapes_Layout_Set_X_Mode = 27;
var historyitem_AutoShapes_Layout_Set_Y_Mode = 28;
var historyitem_AutoShapes_Layout_Set_X = 29;
var historyitem_AutoShapes_Layout_Set_Y = 30;
var historyitem_AutoShapes_SetDrawingObjects = 31;
var historyitem_AutoShapes_SetGroup = 32;
var historyitem_AutoShapes_SetPresetGeometry = 33;
var historyitem_AutoShapes_SetDefaultStyle = 34;
var historyitem_AutoShapes_RecalculateAfterInit = 35;
var historyitem_AutoShapes_SetXfrm = 36;
var historyitem_AutoShapes_AddTextBody = 37;
var historyitem_AutoShapes_AddDocContent = 38;
var historyitem_AutoShapes_AddDrawingDocument = 39;
var historyitem_AutoShapes_AddParent = 40;
var historyitem_AutoShapes_AddParagraph = 41;
var historyitem_AutoShapes_SetShape = 42;
var historyitem_AutoShapes_SetTextPr = 43;
var historyitem_AutoShapes_SetDefaultTextRectStyle = 44;
var historyitem_AutoShapes_SetFill = 45;
var historyitem_AutoShapes_SetFType = 46;
var historyitem_AutoShapes_SetFgColor = 47;
var historyitem_AutoShapes_SetBgColor = 48;
var historyitem_AutoShapes_SetUniFill = 49;
var historyitem_AutoShapes_SetUniLine = 50;
var historyitem_AutoShapes_SetLineWidth = 51;
var historyitem_AutoShapes_RecalculateAfterParagraphAddRedo = 52;
var historyitem_AutoShapes_RecalculateAfterParagraphAddUndo = 53;
var historyitem_AutoShapes_SetTransparent = 54;
var historyitem_AutoShapes_RecalculateBrushRedo = 55;
var historyitem_AutoShapes_RecalculateBrushUndo = 56;
var historyitem_AutoShapes_AddToSpTree = 57;
var historyitem_AutoShapes_DeleteDrawingBase = 58;
var historyitem_AutoShapes_VerticalAlign = 59;
var historyitem_AutoShapes_Vert = 60;
var historyitem_AutoShapes_GroupRecalculateUndo = 61;
var historyitem_AutoShapes_GroupRecalculateRedo = 62;
var historyitem_AutoShapes_AddColorMod = 63;
var historyitem_AutoShapes_RemoveFromSpTree = 64;
var historyitem_AutoShapes_SwapGraphicObjects = 65;
var historyitem_AutoShapes_TopInset = 66;
var historyitem_AutoShapes_RightInset = 67;
var historyitem_AutoShapes_LeftInset = 68;
var historyitem_AutoShapes_BottomInset = 69;
var historyitem_AutoShapes_Set_AutoShapeStyle = 70;
var historyitem_AutoShapes_Set_ImageBlipFill = 71;
var historyitem_AutoShapes_Set_AscChart = 72;
var historyitem_AutoShapes_Set_PathStroke = 73;
var historyitem_AutoShapes_Set_PathFill = 74;
var historyitem_AutoShapes_Set_PathWH = 75;
var historyitem_AutoShapes_SetTailEnd = 76;
var historyitem_AutoShapes_SetHeadEnd = 77;
var historyitem_AutoShapes_AddTitle = 78;
var historyitem_AutoShapes_AddXAxis = 79;
var historyitem_AutoShapes_AddYAxis = 80;
var historyitem_AutoShapes_AddChartGroup = 81;
var historyitem_AutoShapes_SetChartTitleLayout = 82;
var historyitem_AutoShapes_SetChartOverlay = 83;
var historyitem_AutoShapes_InitChart = 84;
var historyitem_AutoShapes_SetChartTitleType = 85;
var historyitem_AutoShapes_OnContentRecalculateUndo = 86;
var historyitem_AutoShapes_OnContentRecalculateRedo = 87;
var historyitem_AutoShapes_GeometryAddPreset = 88;
var historyitem_AutoShapes_AddToGroupSpTreeToPos = 89;
var historyitem_AutoShapes_GroupRecalculateArrGraphicObjectsUndo = 90;
var historyitem_AutoShapes_GroupRecalculateArrGraphicObjectsRedo = 91;
var historyitem_AutoShapes_RecalculateAfterInit2Chart = 92;
var historyitem_AutoShapes_GroupRecalculateAfterLoad = 93;
......
Excel/view/WorkbookView.js
View file @ 2126093e
......@@ -603,6 +603,7 @@
}
var ws = this.getWorksheet(index);
ws.objectRender.controller.setSelectionState(state);
ws.objectRender.controller.updateOverlay();
ws.objectRender.controller.updateSelectionState();
// Селектим после выставления состояния
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7