Commit 967af72a authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Перенос инициализации global counters

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47991 954022d7-b5bf-4e40-9824-e11837661b57
parent 909f7b82
...@@ -1304,6 +1304,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1304,6 +1304,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
this.CoAuthoringApi.init (user, docId, this.asc_getViewerMode(), 'fghhfgsjdgfjs', window.location.host, g_sMainServiceLocalUrl, function(){ this.CoAuthoringApi.init (user, docId, this.asc_getViewerMode(), 'fghhfgsjdgfjs', window.location.host, g_sMainServiceLocalUrl, function(){
}, /*isExcel*/true); }, /*isExcel*/true);
// Global counters
g_oIdCounter.Set_UserId(user.asc_getId());
}, },
// Set CoAuthoring server url // Set CoAuthoring server url
......
...@@ -1394,6 +1394,10 @@ Workbook.prototype.initGlobalObjects=function(){ ...@@ -1394,6 +1394,10 @@ Workbook.prototype.initGlobalObjects=function(){
g_oUndoRedoDrawingLayer = new UndoRedoDrawingLayer(this); g_oUndoRedoDrawingLayer = new UndoRedoDrawingLayer(this);
g_oUndoRedoAutoFilters = new UndoRedoAutoFilters(this); g_oUndoRedoAutoFilters = new UndoRedoAutoFilters(this);
g_oUndoRedoGraphicObjects = new UndoRedoGraphicObjects(this); g_oUndoRedoGraphicObjects = new UndoRedoGraphicObjects(this);
// Global counters
g_oIdCounter = new CIdCounter();
g_oTableId = new CTableId();
} }
Workbook.prototype.init=function(){ Workbook.prototype.init=function(){
if(this.nActive < 0) if(this.nActive < 0)
......
...@@ -88,11 +88,6 @@ ...@@ -88,11 +88,6 @@
this.stringRender = undefined; this.stringRender = undefined;
this.drawingCtxCharts = undefined; this.drawingCtxCharts = undefined;
// Global counters
g_oIdCounter = new CIdCounter();
g_oTableId = new CTableId();
g_oIdCounter.Set_UserId(this.Api.User.asc_getId());
// Максимальная ширина числа из 0,1,2...,9, померенная в нормальном шрифте(дефалтовый для книги) в px(целое) // Максимальная ширина числа из 0,1,2...,9, померенная в нормальном шрифте(дефалтовый для книги) в px(целое)
// Ecma-376 Office Open XML Part 1, пункт 18.3.1.13 // Ecma-376 Office Open XML Part 1, пункт 18.3.1.13
this.maxDigitWidth = 0; this.maxDigitWidth = 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