Commit fb595991 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Удалил неиспользуемые функции из DrawingObjects

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59826 954022d7-b5bf-4e40-9824-e11837661b57
parent 93dee393
This diff is collapsed.
...@@ -2739,7 +2739,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2739,7 +2739,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
{ {
for(var i = 0; i < drawing_area.frozenPlaces.length; ++i) for(var i = 0; i < drawing_area.frozenPlaces.length; ++i)
{ {
worksheet.objectRender.showDrawingObjects(false, new GraphicOption(worksheet, c_oAscGraphicOption.ScrollVertical, drawing_area.frozenPlaces[i].range, null, {offsetX: 0, offsetY: 0})); worksheet.objectRender.showDrawingObjects(false, new GraphicOption(worksheet, c_oAscGraphicOption.ScrollVertical, drawing_area.frozenPlaces[i].range, {offsetX: 0, offsetY: 0}));
} }
} }
......
...@@ -193,9 +193,7 @@ var c_oAscSelectionDialogType = { ...@@ -193,9 +193,7 @@ var c_oAscSelectionDialogType = {
var c_oAscGraphicOption = { var c_oAscGraphicOption = {
ScrollVertical : 1, ScrollVertical : 1,
ScrollHorizontal : 2, ScrollHorizontal : 2
AddText : 3,
ChangePosition : 4
}; };
var c_oAscHyperlinkType = { var c_oAscHyperlinkType = {
......
...@@ -2237,7 +2237,7 @@ ...@@ -2237,7 +2237,7 @@
range = this.visibleRange; range = this.visibleRange;
} }
var ctx, left, top, cFrozen, rFrozen; var left, top, cFrozen, rFrozen;
var offsetX = (undefined === offsetXForDraw) ? this.cols[this.visibleRange.c1].left - this.cellsLeft : offsetXForDraw; var offsetX = (undefined === offsetXForDraw) ? this.cols[this.visibleRange.c1].left - this.cellsLeft : offsetXForDraw;
var offsetY = (undefined === offsetYForDraw) ? this.rows[this.visibleRange.r1].top - this.cellsTop : offsetYForDraw; var offsetY = (undefined === offsetYForDraw) ? this.rows[this.visibleRange.r1].top - this.cellsTop : offsetYForDraw;
if (undefined === drawingCtx && this.topLeftFrozenCell) { if (undefined === drawingCtx && this.topLeftFrozenCell) {
...@@ -5282,7 +5282,7 @@ ...@@ -5282,7 +5282,7 @@
this._drawCellsAndBorders(/*drawingCtx*/undefined, range); this._drawCellsAndBorders(/*drawingCtx*/undefined, range);
this._drawAutoF(range, offsetX, offsetY); this._drawAutoF(range, offsetX, offsetY);
this.objectRender.showDrawingObjectsEx(false, new GraphicOption(this, this.objectRender.showDrawingObjectsEx(false, new GraphicOption(this,
c_oAscGraphicOption.ScrollVertical, range, undefined, {offsetX: offsetX, offsetY: offsetY})); c_oAscGraphicOption.ScrollVertical, range, {offsetX: offsetX, offsetY: offsetY}));
if (0 < cFrozen) { if (0 < cFrozen) {
range.c1 = 0; range.c1 = 0;
range.c2 = cFrozen - 1; range.c2 = cFrozen - 1;
...@@ -5291,7 +5291,7 @@ ...@@ -5291,7 +5291,7 @@
this._drawCellsAndBorders(/*drawingCtx*/undefined, range, offsetX); this._drawCellsAndBorders(/*drawingCtx*/undefined, range, offsetX);
this._drawAutoF(range, offsetX, offsetY); this._drawAutoF(range, offsetX, offsetY);
this.objectRender.showDrawingObjectsEx(false, new GraphicOption(this, this.objectRender.showDrawingObjectsEx(false, new GraphicOption(this,
c_oAscGraphicOption.ScrollVertical, range, undefined, {offsetX: offsetX, offsetY: offsetY})); c_oAscGraphicOption.ScrollVertical, range, {offsetX: offsetX, offsetY: offsetY}));
} }
// Отрисовывать нужно всегда, вдруг бордеры // Отрисовывать нужно всегда, вдруг бордеры
this._drawFrozenPaneLines(); this._drawFrozenPaneLines();
...@@ -5410,7 +5410,7 @@ ...@@ -5410,7 +5410,7 @@
this._drawCellsAndBorders(/*drawingCtx*/undefined, range); this._drawCellsAndBorders(/*drawingCtx*/undefined, range);
this._drawAutoF(range, offsetX, offsetY); this._drawAutoF(range, offsetX, offsetY);
this.objectRender.showDrawingObjectsEx(false, new GraphicOption(this, this.objectRender.showDrawingObjectsEx(false, new GraphicOption(this,
c_oAscGraphicOption.ScrollHorizontal, range, undefined, {offsetX: offsetX, offsetY: offsetY})); c_oAscGraphicOption.ScrollHorizontal, range, {offsetX: offsetX, offsetY: offsetY}));
if (rFrozen) { if (rFrozen) {
range.r1 = 0; range.r1 = 0;
range.r2 = rFrozen - 1; range.r2 = rFrozen - 1;
...@@ -5419,7 +5419,7 @@ ...@@ -5419,7 +5419,7 @@
this._drawCellsAndBorders(/*drawingCtx*/undefined, range, undefined, offsetY); this._drawCellsAndBorders(/*drawingCtx*/undefined, range, undefined, offsetY);
this._drawAutoF(range, offsetX, offsetY); this._drawAutoF(range, offsetX, offsetY);
this.objectRender.showDrawingObjectsEx(false, new GraphicOption(this, this.objectRender.showDrawingObjectsEx(false, new GraphicOption(this,
c_oAscGraphicOption.ScrollHorizontal, range, undefined, {offsetX: offsetX, offsetY: offsetY})); c_oAscGraphicOption.ScrollHorizontal, range, {offsetX: offsetX, offsetY: offsetY}));
} }
// Отрисовывать нужно всегда, вдруг бордеры // Отрисовывать нужно всегда, вдруг бордеры
this._drawFrozenPaneLines(); this._drawFrozenPaneLines();
......
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