From b7731b1eb47f2f65ce29ec83740734ec54fcca49 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Tue, 26 Apr 2016 18:53:48 +0300 Subject: [PATCH] cell/model/WorkbookElems to function-closure --- build/configs/webexcel.json | 4 +- build/configs/webpowerpoint.json | 4 +- build/configs/webword.json | 4 +- cell/.unit-tests/RunCellFormatTests.html | 2 +- cell/.unit-tests/testsForFWB.html | 2 +- cell/api.js | 14 +- cell/graphics/DrawingContext.js | 10 +- cell/graphics/pdfprinter.js | 4 +- cell/model/ConditionalFormatting.js | 2 +- .../lookupandreferenceFunctions.js | 2 +- cell/model/Serialize.js | 202 ++++++------ cell/model/UndoRedo.js | 28 +- cell/model/Workbook.js | 134 ++++---- cell/model/WorkbookElems.js | 309 ++++++++++-------- cell/model/autofilters.js | 68 ++-- cell/model/clipboard.js | 20 +- cell/native/DrawingContext.js | 10 +- cell/utils/utils.js | 2 +- cell/view/CellEditorView.js | 1 + cell/view/WorksheetView.js | 25 +- common/Charts/DrawingObjects.js | 4 +- common/NumFormat.js | 2 +- common/SerializeCommonWordExcel.js | 2 +- 23 files changed, 453 insertions(+), 402 deletions(-) diff --git a/build/configs/webexcel.json b/build/configs/webexcel.json index d01c3e5561..cbcfe336fc 100644 --- a/build/configs/webexcel.json +++ b/build/configs/webexcel.json @@ -82,7 +82,6 @@ "../cell/graphics/pdfprinter.js", "../cell/model/CollaborativeEditing.js", "../cell/model/ConditionalFormatting.js", - "../cell/model/FormulaObjects/parserFormula.js", "../cell/model/FormulaObjects/_xlfnFunctions.js", "../cell/model/FormulaObjects/dateandtimeFunctions.js", @@ -96,8 +95,9 @@ "../cell/model/FormulaObjects/lookupandreferenceFunctions.js", "../cell/model/FormulaObjects/informationFunctions.js", "../cell/model/FormulaObjects/logicalFunctions.js", - "../cell/model/Serialize.js", "../cell/model/WorkbookElems.js", + "../cell/model/Serialize.js", + "../cell/model/Workbook.js", "../cell/model/CellInfo.js", "../cell/model/History.js", diff --git a/build/configs/webpowerpoint.json b/build/configs/webpowerpoint.json index b1cd86288d..c3378b932d 100644 --- a/build/configs/webpowerpoint.json +++ b/build/configs/webpowerpoint.json @@ -75,6 +75,8 @@ "../slide/themes/Themes.js", "../cell/utils/utils.js", + "../cell/model/WorkbookElems.js", + "../cell/model/Serialize.js", "../slide/Drawing/ThemeLoader.js", "../word/Editor/Serialize2.js", @@ -144,8 +146,6 @@ "../slide/apiCommon.js", "../word/apiCommon.js", "../slide/apiExport.js", - "../cell/model/Serialize.js", - "../cell/model/WorkbookElems.js", "../cell/model/Workbook.js", "../cell/model/CellInfo.js" ], diff --git a/build/configs/webword.json b/build/configs/webword.json index 04899df981..ae0bdf01f2 100644 --- a/build/configs/webword.json +++ b/build/configs/webword.json @@ -78,6 +78,8 @@ "../word/apiDefines.js", "../cell/utils/utils.js", + "../cell/model/WorkbookElems.js", + "../cell/model/Serialize.js", "../word/Drawing/translations.js", "../word/Editor/GraphicObjects/Format/ShapePrototype.js", @@ -143,8 +145,6 @@ "../word/Math/accent.js", "../word/Math/borderBox.js", "../cell/model/CellComment.js", - "../cell/model/Serialize.js", - "../cell/model/WorkbookElems.js", "../cell/model/Workbook.js", "../cell/model/CellInfo.js" ], diff --git a/cell/.unit-tests/RunCellFormatTests.html b/cell/.unit-tests/RunCellFormatTests.html index da5973300c..42d68c6151 100644 --- a/cell/.unit-tests/RunCellFormatTests.html +++ b/cell/.unit-tests/RunCellFormatTests.html @@ -17,7 +17,7 @@ diff --git a/cell/.unit-tests/testsForFWB.html b/cell/.unit-tests/testsForFWB.html index 078ad663af..d86ec1c767 100644 --- a/cell/.unit-tests/testsForFWB.html +++ b/cell/.unit-tests/testsForFWB.html @@ -17,7 +17,7 @@ diff --git a/cell/api.js b/cell/api.js index 466166f40c..1665e41452 100644 --- a/cell/api.js +++ b/cell/api.js @@ -127,7 +127,7 @@ var editor; var arr_colors = new Array(10); var _count = arr_colors.length; for (var i = 0; i < _count; ++i) { - var color = g_oColorManager.getThemeColor(i); + var color = AscCommonExcel.g_oColorManager.getThemeColor(i); arr_colors[i] = new CColor(color.getR(), color.getG(), color.getB()); } @@ -177,11 +177,11 @@ var editor; var _cur_index = 0; for (var i = 0; i < _count; ++i) { - var basecolor = g_oColorManager.getThemeColor(i); - var aTints = g_oThemeColorsDefaultModsSpreadsheet[AscCommon.GetDefaultColorModsIndex(basecolor.getR(), basecolor.getG(), basecolor.getB())]; + var basecolor = AscCommonExcel.g_oColorManager.getThemeColor(i); + var aTints = AscCommonExcel.g_oThemeColorsDefaultModsSpreadsheet[AscCommon.GetDefaultColorModsIndex(basecolor.getR(), basecolor.getG(), basecolor.getB())]; for (var j = 0, length = aTints.length; j < length; ++j) { var tint = aTints[j]; - var color = g_oColorManager.getThemeColor(i, tint); + var color = AscCommonExcel.g_oColorManager.getThemeColor(i, tint); _ret_array[_cur_index] = new CColor(color.getR(), color.getG(), color.getB()); _cur_index++; } @@ -1716,7 +1716,7 @@ var editor; var t = this; var changeTabColorCallback = function(res) { if (res) { - color = CorrectAscColor(color); + color = AscCommonExcel.CorrectAscColor(color); t.wbModel.getWorksheet(index).setTabColor(color); } }; @@ -2778,7 +2778,7 @@ var editor; ws.objectRender.controller.setCellTextColor(color); } else { if (color instanceof Asc.asc_CColor) { - color = CorrectAscColor(color); + color = AscCommonExcel.CorrectAscColor(color); this.wb.setFontAttributes("c", color); this.wb.restoreFocus(); } @@ -2793,7 +2793,7 @@ var editor; } else { if (color instanceof Asc.asc_CColor || null == color) { if (null != color) { - color = CorrectAscColor(color); + color = AscCommonExcel.CorrectAscColor(color); } this.wb.getWorksheet().setSelectionInfo("bc", color); this.wb.restoreFocus(); diff --git a/cell/graphics/DrawingContext.js b/cell/graphics/DrawingContext.js index 3b3d169b08..bae1aeb89f 100644 --- a/cell/graphics/DrawingContext.js +++ b/cell/graphics/DrawingContext.js @@ -19,7 +19,7 @@ var g = color.getG(); var b = color.getB(); var bTheme = false; - if(color instanceof ThemeColor && null != color.theme) + if(color instanceof AscCommonExcel.ThemeColor && null != color.theme) { var array_colors_types = [6, 15, 7, 16, 0, 1, 2, 3, 4, 5]; var themePresentation = array_colors_types[color.theme]; @@ -27,8 +27,8 @@ if(null != color.tint) tintExcel = color.tint; var tintPresentation = 0; - var basecolor = g_oColorManager.getThemeColor(color.theme); - var oThemeColorTint = g_oThemeColorsDefaultModsSpreadsheet[AscCommon.GetDefaultColorModsIndex(basecolor.getR(), basecolor.getG(), basecolor.getB())]; + var basecolor = AscCommonExcel.g_oColorManager.getThemeColor(color.theme); + var oThemeColorTint = AscCommonExcel.g_oThemeColorsDefaultModsSpreadsheet[AscCommon.GetDefaultColorModsIndex(basecolor.getR(), basecolor.getG(), basecolor.getB())]; if(null != oThemeColorTint) { for(var i = 0 , length = oThemeColorTint.length; i < length; ++i) @@ -708,7 +708,7 @@ }; /** - * @param {RgbColor || ThemeColor || AscCommon.CColor} val + * @param {AscCommonExcel.RgbColor || AscCommonExcel.ThemeColor || AscCommon.CColor} val * @returns {DrawingContext} */ DrawingContext.prototype.setFillStyle = function (val) { @@ -727,7 +727,7 @@ }; /** - * @param {RgbColor || ThemeColor || AscCommon.CColor} val + * @param {AscCommonExcel.RgbColor || AscCommonExcel.ThemeColor || AscCommon.CColor} val * @returns {DrawingContext} */ DrawingContext.prototype.setStrokeStyle = function (val) { diff --git a/cell/graphics/pdfprinter.js b/cell/graphics/pdfprinter.js index fab084b451..d54f207163 100644 --- a/cell/graphics/pdfprinter.js +++ b/cell/graphics/pdfprinter.js @@ -144,7 +144,7 @@ CPdfPrinter.prototype = return "miter"; }, /** - * @param {RgbColor || ThemeColor || AscCommon.CColor} val + * @param {AscCommonExcel.RgbColor || AscCommonExcel.ThemeColor || AscCommon.CColor} val * @returns {CPdfPrinter} */ setFillStyle : function(val) @@ -163,7 +163,7 @@ CPdfPrinter.prototype = return this; }, /** - * @param {RgbColor || ThemeColor || AscCommon.CColor} val + * @param {AscCommonExcel.RgbColor || AscCommonExcel.ThemeColor || AscCommon.CColor} val * @returns {CPdfPrinter} */ setStrokeStyle : function(val) diff --git a/cell/model/ConditionalFormatting.js b/cell/model/ConditionalFormatting.js index b9dae18ce2..5d2bb141ee 100644 --- a/cell/model/ConditionalFormatting.js +++ b/cell/model/ConditionalFormatting.js @@ -225,7 +225,7 @@ var g = (this.g1 + ((FT_Common.IntToUInt(this.g2 - this.g1) * indexColor) >> this.base_shift)) & 0xFF; var b = (this.b1 + ((FT_Common.IntToUInt(this.b2 - this.b1) * indexColor) >> this.base_shift)) & 0xFF; //console.log("index=" + indexColor + ": r=" + r + " g=" + g + " b=" + b); - return new RgbColor((r << 16) + (g << 8) + b); + return new AscCommonExcel.RgbColor((r << 16) + (g << 8) + b); }; /* diff --git a/cell/model/FormulaObjects/lookupandreferenceFunctions.js b/cell/model/FormulaObjects/lookupandreferenceFunctions.js index 61719b8e6b..b21fa6d88f 100644 --- a/cell/model/FormulaObjects/lookupandreferenceFunctions.js +++ b/cell/model/FormulaObjects/lookupandreferenceFunctions.js @@ -1349,7 +1349,7 @@ VHLOOKUPCache.prototype.get = function ( range, valueForSearching, isValueString this.cacheId[sRangeName] = cacheElem; var cacheRange = this.cacheRanges[wsId]; if ( null == cacheRange ) { - cacheRange = new RangeDataManager( null ); + cacheRange = new AscCommonExcel.RangeDataManager( null ); this.cacheRanges[wsId] = cacheRange; } cacheRange.add( range.getBBox0(), cacheElem ); diff --git a/cell/model/Serialize.js b/cell/model/Serialize.js index 27cf1afc9f..6c528a7684 100644 --- a/cell/model/Serialize.js +++ b/cell/model/Serialize.js @@ -16,6 +16,8 @@ var c_oSerConstants = AscCommon.c_oSerConstants; var c_oAscPageOrientation = Asc.c_oAscPageOrientation; + + var g_oDefaultFormat = AscCommonExcel.g_oDefaultFormat; /** @enum */ var c_oSerFormat = { @@ -987,6 +989,8 @@ Group: 1, Custom: 2 }; + + var g_nNumsMaxId = 160; var DocumentPageSize = new function() { this.oSizes = [ @@ -1093,9 +1097,9 @@ return bcr.ReadColorSpreadsheet(t,l, color); }); if(null != color.theme) - output = g_oColorManager.getThemeColor(color.theme, color.tint); + output = AscCommonExcel.g_oColorManager.getThemeColor(color.theme, color.tint); else if(null != color.rgb) - output = new RgbColor(0x00ffffff & color.rgb); + output = new AscCommonExcel.RgbColor(0x00ffffff & color.rgb); return output; }; @@ -1227,7 +1231,7 @@ }; this.WriteDateGroupItem = function(dateGroupItem) { - var oDateGroupItem = new DateGroupItem(); + var oDateGroupItem = new AscCommonExcel.DateGroupItem(); oDateGroupItem.convertRangeToDateGroupItem(dateGroupItem); dateGroupItem = oDateGroupItem; @@ -1628,7 +1632,7 @@ for(var i = 0, length = aBorders.length; i < length; ++i) { var border = aBorders[i]; - this.bs.WriteItem(c_oSerStylesTypes.Border, function(){oThis.WriteBorder(border.getDif(g_oDefaultBorderAbs));}); + this.bs.WriteItem(c_oSerStylesTypes.Border, function(){oThis.WriteBorder(border.getDif(g_oDefaultFormat.BorderAbs));}); } }; this.WriteBorder = function(border) @@ -1738,17 +1742,17 @@ for(var i = 0, length = aFonts.length; i < length; ++i) { var font = aFonts[i]; - var fontMinimized = font.getDif(g_oDefaultFontAbs); + var fontMinimized = font.getDif(g_oDefaultFormat.FontAbs); if(null == fontMinimized) - fontMinimized = new Font(); + fontMinimized = new AscCommonExcel.Font(); if(null == fontMinimized.fn) - fontMinimized.fn = g_oDefaultFontAbs.fn; + fontMinimized.fn = g_oDefaultFormat.FontAbs.fn; if(null == fontMinimized.scheme) - fontMinimized.scheme = g_oDefaultFontAbs.scheme; + fontMinimized.scheme = g_oDefaultFormat.FontAbs.scheme; if(null == fontMinimized.fs) - fontMinimized.fs = g_oDefaultFontAbs.fs; + fontMinimized.fs = g_oDefaultFormat.FontAbs.fs; if(null == fontMinimized.c) - fontMinimized.c = g_oDefaultFontAbs.c; + fontMinimized.c = g_oDefaultFormat.FontAbs.c; this.bs.WriteItem(c_oSerStylesTypes.Font, function(){oThis.WriteFont(fontMinimized);}); } }; @@ -1824,7 +1828,7 @@ for(var i in this.oNumMap) { var num = this.oNumMap[i]; - if(false == num.val.isEqual(g_oDefaultNumAbs)) + if(false == num.val.isEqual(g_oDefaultFormat.NumAbs)) this.bs.WriteItem(c_oSerStylesTypes.NumFmt, function(){oThis.WriteNum({id: num.index, f: num.val.f});}); } }; @@ -1920,7 +1924,7 @@ } if(null != xfs.align) { - var alignMinimized = xfs.align.getDif(g_oDefaultAlignAbs); + var alignMinimized = xfs.align.getDif(g_oDefaultFormat.AlignAbs); if(null != alignMinimized) { this.memory.WriteByte(c_oSerXfsTypes.ApplyAlignment); @@ -2330,27 +2334,27 @@ }; this._prepeareStyles = function() { - this.oFontMap[this._getStringFromObjWithProperty(g_oDefaultFont)] = {index: this.nFontMapIndex++, val: g_oDefaultFont}; + this.oFontMap[this._getStringFromObjWithProperty(g_oDefaultFormat.Font)] = {index: this.nFontMapIndex++, val: g_oDefaultFormat.Font}; //первый 2 fill должны быть стандартными. Excel игнорирует то что записано, берет стандартные - this.oFillMap[this._getStringFromObjWithProperty(new Fill())] = { index: this.nFillMapIndex++, val: new Fill() }; + this.oFillMap[this._getStringFromObjWithProperty(new AscCommonExcel.Fill())] = { index: this.nFillMapIndex++, val: new AscCommonExcel.Fill() }; //не добавляем в oFillMap а делаем nFillMapIndex, потому что элементы совпадают и перетрут друг друга this.nFillMapIndex++; //проверяем совпадает ли g_oDefaultFill с new Fill - var sFillHash = this._getStringFromObjWithProperty(g_oDefaultFill); + var sFillHash = this._getStringFromObjWithProperty(g_oDefaultFormat.Fill); var oFillDefElement = this.oFillMap[sFillHash]; if (null == oFillDefElement) { this.nDefaultFillIndex = this.nFillMapIndex; - oFillDefElement = {index: this.nFillMapIndex++, val: g_oDefaultFill}; + oFillDefElement = {index: this.nFillMapIndex++, val: g_oDefaultFormat.Fill}; this.oFillMap[sFillHash] = oFillDefElement; } - this.oBorderMap[this._getStringFromObjWithProperty(g_oDefaultBorder)] = {index: this.nBorderMapIndex++, val: g_oDefaultBorder}; + this.oBorderMap[this._getStringFromObjWithProperty(g_oDefaultFormat.Border)] = {index: this.nBorderMapIndex++, val: g_oDefaultFormat.Border}; this.nNumMapIndex = g_nNumsMaxId; var sAlign = "0"; var oAlign = null; - if(false == g_oDefaultAlign.isEqual(g_oDefaultAlignAbs)) + if(false == g_oDefaultFormat.Align.isEqual(g_oDefaultFormat.AlignAbs)) { - oAlign = g_oDefaultAlign; - sAlign = this._getStringFromObjWithProperty(g_oDefaultAlign); + oAlign = g_oDefaultFormat.Align; + sAlign = this._getStringFromObjWithProperty(g_oDefaultFormat.Align); } this.prepareXfsStyles(); var xfs = { borderid: 0, fontid: 0, fillid: oFillDefElement.index, numid: 0, align: oAlign, QuotePrefix: null }; @@ -2660,13 +2664,13 @@ this.memory.WriteByte(c_oSerPropLenType.Double); this.memory.WriteDouble2(oAllRow.h); } - if(0 != (g_nRowFlag_CustomHeight & oAllRow.flags)) + if(0 != (AscCommonExcel.g_nRowFlag_CustomHeight & oAllRow.flags)) { this.memory.WriteByte(c_oSerSheetFormatPrTypes.CustomHeight); this.memory.WriteByte(c_oSerPropLenType.Byte); this.memory.WriteBool(true); } - if(0 != (g_nRowFlag_hd & oAllRow.flags)) + if(0 != (AscCommonExcel.g_nRowFlag_hd & oAllRow.flags)) { this.memory.WriteByte(c_oSerSheetFormatPrTypes.ZeroHeight); this.memory.WriteByte(c_oSerPropLenType.Byte); @@ -3020,13 +3024,13 @@ this.memory.WriteByte(c_oSerPropLenType.Double); this.memory.WriteDouble2(oRow.h); } - if(0 != (g_nRowFlag_CustomHeight & oRow.flags)) + if(0 != (AscCommonExcel.g_nRowFlag_CustomHeight & oRow.flags)) { this.memory.WriteByte(c_oSerRowTypes.CustomHeight); this.memory.WriteByte(c_oSerPropLenType.Byte); this.memory.WriteBool(true); } - if(0 != (g_nRowFlag_hd & oRow.flags)) + if(0 != (AscCommonExcel.g_nRowFlag_hd & oRow.flags)) { this.memory.WriteByte(c_oSerRowTypes.Hidden); this.memory.WriteByte(c_oSerPropLenType.Byte); @@ -3151,7 +3155,7 @@ sStyle.numid = this.getNumIdByFormat(xfs.num); sStyle.val += "|" + sStyle.numid.toString(); - if(null != xfs.align && false == xfs.align.isEqual(g_oDefaultAlignAbs)) + if(null != xfs.align && false == xfs.align.isEqual(g_oDefaultFormat.AlignAbs)) sStyle.align = this._getStringFromObjWithProperty(xfs.align); sStyle.val += "|" + sStyle.align; sStyle.val += "|"; @@ -3899,14 +3903,14 @@ oTable.DisplayName = this.stream.GetString2LE(length); else if ( c_oSer_TablePart.AutoFilter == type ) { - oTable.AutoFilter = new AutoFilter(); + oTable.AutoFilter = new AscCommonExcel.AutoFilter(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadAutoFilter(t,l, oTable.AutoFilter); }); } else if ( c_oSer_TablePart.SortState == type ) { - oTable.SortState = new SortState(); + oTable.SortState = new AscCommonExcel.SortState(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadSortState(t,l, oTable.SortState); }); @@ -3920,7 +3924,7 @@ } else if ( c_oSer_TablePart.TableStyleInfo == type ) { - oTable.TableStyleInfo = new TableStyleInfo(); + oTable.TableStyleInfo = new AscCommonExcel.TableStyleInfo(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadTableStyleInfo(t,l, oTable.TableStyleInfo); }); @@ -3944,7 +3948,7 @@ } else if ( c_oSer_AutoFilter.SortState == type ) { - oAutoFilter.SortState = new SortState(); + oAutoFilter.SortState = new AscCommonExcel.SortState(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadSortState(t,l, oAutoFilter.SortState); }); @@ -3959,7 +3963,7 @@ var oThis = this; if ( c_oSer_AutoFilter.FilterColumn == type ) { - var oFilterColumn = new FilterColumn(); + var oFilterColumn = new AscCommonExcel.FilterColumn(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadFilterColumn(t,l, oFilterColumn); }); @@ -3977,7 +3981,7 @@ oFilterColumn.ColId = this.stream.GetULongLE(); else if ( c_oSer_FilterColumn.Filters == type ) { - oFilterColumn.Filters = new Filters(); + oFilterColumn.Filters = new AscCommonExcel.Filters(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadFilters(t,l, oFilterColumn.Filters); }); @@ -3993,27 +3997,27 @@ } else if ( c_oSer_FilterColumn.CustomFilters == type ) { - oFilterColumn.CustomFiltersObj = new CustomFilters(); + oFilterColumn.CustomFiltersObj = new Asc.CustomFilters(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadCustomFilters(t,l, oFilterColumn.CustomFiltersObj); }); } else if ( c_oSer_FilterColumn.DynamicFilter == type ) { - oFilterColumn.DynamicFilter = new DynamicFilter(); + oFilterColumn.DynamicFilter = new Asc.DynamicFilter(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadDynamicFilter(t,l, oFilterColumn.DynamicFilter); }); }else if ( c_oSer_FilterColumn.ColorFilter == type ) { - oFilterColumn.ColorFilter = new ColorFilter(); + oFilterColumn.ColorFilter = new Asc.ColorFilter(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadColorFilter(t,l, oFilterColumn.ColorFilter); }); } else if ( c_oSer_FilterColumn.Top10 == type ) { - oFilterColumn.Top10 = new Top10(); + oFilterColumn.Top10 = new Asc.Top10(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadTop10(t,l, oFilterColumn.Top10); }); @@ -4032,7 +4036,7 @@ var oThis = this; if ( c_oSer_FilterColumn.Filter == type ) { - var oFilterVal = new Filter(); + var oFilterVal = new AscCommonExcel.Filter(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadFilter(t,l, oFilterVal); }); @@ -4041,12 +4045,12 @@ } else if ( c_oSer_FilterColumn.DateGroupItem == type ) { - var oDateGroupItem = new DateGroupItem(); + var oDateGroupItem = new AscCommonExcel.DateGroupItem(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadDateGroupItem(t,l, oDateGroupItem); }); - var autoFilterDateElem = new AutoFilterDateElem(); + var autoFilterDateElem = new AscCommonExcel.AutoFilterDateElem(); autoFilterDateElem.convertDateGroupItemToRange(oDateGroupItem); oFilters.Dates.push(autoFilterDateElem); } @@ -4109,7 +4113,7 @@ var oThis = this; if ( c_oSer_CustomFilters.CustomFilter == type ) { - var oCustomFiltersItem = new CustomFilter(); + var oCustomFiltersItem = new Asc.CustomFilter(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadCustomFiltersItem(t,l, oCustomFiltersItem); }); @@ -4196,7 +4200,7 @@ var oThis = this; if ( c_oSer_SortState.SortCondition == type ) { - var oSortCondition = new SortCondition(); + var oSortCondition = new AscCommonExcel.SortCondition(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadSortConditionContent(t,l, oSortCondition); }); @@ -4253,7 +4257,7 @@ var oThis = this; if ( c_oSer_TableColumns.TableColumn == type ) { - var oTableColumn = new TableColumn(); + var oTableColumn = new AscCommonExcel.TableColumn(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadTableColumn(t,l, oTableColumn); }); @@ -4301,7 +4305,7 @@ if ( c_oSerSharedStringTypes.Si === type ) { var oThis = this; - var Si = new CCellValue(); + var Si = new AscCommonExcel.CCellValue(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadSharedString(t,l,Si); }); @@ -4318,7 +4322,7 @@ if ( c_oSerSharedStringTypes.Run == type ) { var oThis = this; - var oRun = new CCellValueMultiText(); + var oRun = new AscCommonExcel.CCellValueMultiText(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadRun(t,l,oRun); }); @@ -4343,7 +4347,7 @@ if ( c_oSerSharedStringTypes.RPr == type ) { if(null == oRun.format) - oRun.format = new Font(); + oRun.format = new AscCommonExcel.Font(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadRPr(t,l, oRun.format); }); @@ -4458,7 +4462,7 @@ if (null == oCellStyleXfs) continue; - oCellStyle.xfs = new CellXfs(); + oCellStyle.xfs = new AscCommonExcel.CellXfs(); // XfId XfIdTmp = oCellStyle.XfId; if (null !== XfIdTmp) { @@ -4536,7 +4540,7 @@ for(var i = 0, length = oStyleObject.aCellXfs.length; i < length; ++i) { var xfs = oStyleObject.aCellXfs[i]; - var oNewXfs = new CellXfs(); + var oNewXfs = new AscCommonExcel.CellXfs(); if(null != xfs.borderid) { @@ -4646,15 +4650,15 @@ }; this.minimizeXfs = function(xfs) { - if(null != xfs.border && g_oDefaultBorder.isEqual(xfs.border)) + if(null != xfs.border && g_oDefaultFormat.Border.isEqual(xfs.border)) xfs.border = null; - if(null != xfs.fill && g_oDefaultFill.isEqual(xfs.fill)) + if(null != xfs.fill && g_oDefaultFormat.Fill.isEqual(xfs.fill)) xfs.fill = null; - if(null != xfs.font && g_oDefaultFont.isEqual(xfs.font)) + if(null != xfs.font && g_oDefaultFormat.Font.isEqual(xfs.font)) xfs.font = null; - if(null != xfs.num && g_oDefaultNum.isEqual(xfs.num)) + if(null != xfs.num && g_oDefaultFormat.Num.isEqual(xfs.num)) xfs.num = null; - if(null != xfs.align && g_oDefaultAlignAbs.isEqual(xfs.align)) + if(null != xfs.align && g_oDefaultFormat.AlignAbs.isEqual(xfs.align)) xfs.align = null; }; this.ParseNum = function(oNum, oNumFmts) @@ -4690,7 +4694,7 @@ } if(null != sFormat) { - oRes = new Num(); + oRes = new AscCommonExcel.Num(); oRes.f = sFormat; } return oRes; @@ -4744,7 +4748,7 @@ var oThis = this; if ( c_oSerStylesTypes.Border == type ) { - var oNewBorder = new Border(); + var oNewBorder = new AscCommonExcel.Border(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadBorder(t,l,oNewBorder); }); @@ -4911,7 +4915,7 @@ else if ( c_oSerXfsTypes.Aligment == type ) { if(null == oXfs.Aligment) - oXfs.align = new Align(); + oXfs.align = new AscCommonExcel.Align(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadAligment(t,l,oXfs.align); }); @@ -4968,7 +4972,7 @@ var oThis = this; if ( c_oSerStylesTypes.Fill == type ) { - var oNewFill = new Fill(); + var oNewFill = new AscCommonExcel.Fill(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadFill(t,l,oNewFill); }); @@ -5012,7 +5016,7 @@ var oThis = this; if ( c_oSerStylesTypes.Font == type ) { - var oNewFont = new Font(); + var oNewFont = new AscCommonExcel.Font(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.bssr.ReadRPr(t,l,oNewFont); }); @@ -5060,7 +5064,7 @@ var oThis = this; var oCellStyle = null; if (c_oSerStylesTypes.CellStyle === type) { - oCellStyle = new CCellStyle(); + oCellStyle = new AscCommonExcel.CCellStyle(); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCellStyle(t, l, oCellStyle); }); @@ -5093,7 +5097,7 @@ var oThis = this; if ( c_oSerStylesTypes.Dxf == type ) { - var oDxf = new CellXfs(); + var oDxf = new AscCommonExcel.CellXfs(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadDxf(t,l,oDxf); }); @@ -5109,14 +5113,14 @@ var oThis = this; if ( c_oSer_Dxf.Alignment == type ) { - oDxf.align = new Align(); + oDxf.align = new AscCommonExcel.Align(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadAligment(t,l,oDxf.align); }); } else if ( c_oSer_Dxf.Border == type ) { - var oNewBorder = new Border(); + var oNewBorder = new AscCommonExcel.Border(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadBorder(t,l,oNewBorder); }); @@ -5124,7 +5128,7 @@ } else if ( c_oSer_Dxf.Fill == type ) { - var oNewFill = new Fill(); + var oNewFill = new AscCommonExcel.Fill(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadFill(t,l,oNewFill); }); @@ -5132,7 +5136,7 @@ } else if ( c_oSer_Dxf.Font == type ) { - var oNewFont = new Font(); + var oNewFont = new AscCommonExcel.Font(); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.bssr.ReadRPr(t,l,oNewFont); }); @@ -5497,7 +5501,7 @@ elem.hd = true; } for(var j = elem.Min; j <= elem.Max; j++){ - var oNewCol = new Col(oWorksheet, j - 1); + var oNewCol = new AscCommonExcel.Col(oWorksheet, j - 1); fInitCol(elem, oNewCol); oWorksheet.aCols[oNewCol.index] = oNewCol; } @@ -5564,7 +5568,7 @@ else if ( c_oSerWorksheetsTypes.Autofilter == type ) { oBinary_TableReader = new Binary_TableReader(this.stream, oWorksheet, this.Dxfs); - oWorksheet.AutoFilter = new AutoFilter(); + oWorksheet.AutoFilter = new AscCommonExcel.AutoFilter(); res = this.bcr.Read1(length, function(t,l){ return oBinary_TableReader.ReadAutoFilter(t,l, oWorksheet.AutoFilter); }); @@ -5682,14 +5686,14 @@ var oAllRow = oWorksheet.getAllRow(); var CustomHeight = this.stream.GetBool(); if(CustomHeight) - oAllRow.flags |= g_nRowFlag_CustomHeight; + oAllRow.flags |= AscCommonExcel.g_nRowFlag_CustomHeight; } else if ( c_oSerSheetFormatPrTypes.ZeroHeight == type ) { var oAllRow = oWorksheet.getAllRow(); var hd = this.stream.GetBool(); if(hd) - oAllRow.flags |= g_nRowFlag_hd; + oAllRow.flags |= AscCommonExcel.g_nRowFlag_hd; } else res = c_oSerConstants.ReadUnknown; @@ -5753,7 +5757,7 @@ var oThis = this; if ( c_oSerWorksheetsTypes.Hyperlink == type ) { - var oNewHyperlink = new Hyperlink(); + var oNewHyperlink = new AscCommonExcel.Hyperlink(); res = this.bcr.Read1(length, function(t,l){ return oThis.ReadHyperlink(t,l, ws, oNewHyperlink); }); @@ -5796,7 +5800,7 @@ if ( c_oSerWorksheetsTypes.Row == type ) { var oCellOffset = {pos: null, len: null}; - var oNewRow = new Row(ws); + var oNewRow = new AscCommonExcel.Row(ws); res = this.bcr.Read2Spreadsheet(length, function(t,l){ return oThis.ReadRow(t,l, oNewRow, ws, oCellOffset); }); @@ -5837,19 +5841,19 @@ { oRow.h = this.stream.GetDoubleLE(); if(g_nCurFileVersion < 2) - oRow.flags |= g_nRowFlag_CustomHeight; + oRow.flags |= AscCommonExcel.g_nRowFlag_CustomHeight; } else if ( c_oSerRowTypes.CustomHeight == type ) { var CustomHeight = this.stream.GetBool(); if(CustomHeight) - oRow.flags |= g_nRowFlag_CustomHeight; + oRow.flags |= AscCommonExcel.g_nRowFlag_CustomHeight; } else if ( c_oSerRowTypes.Hidden == type ) { var hd = this.stream.GetBool(); if(hd) - oRow.flags |= g_nRowFlag_hd; + oRow.flags |= AscCommonExcel.g_nRowFlag_hd; } else if ( c_oSerRowTypes.Cells == type ) { @@ -6540,7 +6544,7 @@ var oThis = this; var res = c_oSerConstants.ReadOk; if (c_oSer_Sparkline.SparklineGroup === type) { - var newSparklineGroup = new sparklineGroup(); + var newSparklineGroup = new AscCommonExcel.sparklineGroup(); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadSparklineGroup(t, l, newSparklineGroup); }); @@ -6616,7 +6620,7 @@ var oThis = this; var res = c_oSerConstants.ReadOk; if (c_oSer_Sparkline.Sparkline === type) { - var newSparkline = new sparkline(); + var newSparkline = new AscCommonExcel.sparkline(); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadSparkline(t, l, newSparkline); }); @@ -6865,7 +6869,7 @@ { var wb = this.wb ? this.wb : workbook; - g_oColorManager.setTheme(wb.theme); + AscCommonExcel.g_oColorManager.setTheme(wb.theme); var sMinorFont = null; if(null != wb.theme.themeElements && null != wb.theme.themeElements.fontScheme && null != wb.theme.themeElements.fontScheme.minorFont) @@ -6873,7 +6877,7 @@ var sDefFont = "Arial"; if(null != sMinorFont && "" != sMinorFont) sDefFont = sMinorFont; - g_oDefaultFont = g_oDefaultFontAbs = new Font({ + g_oDefaultFormat.Font = g_oDefaultFormat.FontAbs = new AscCommonExcel.Font({ fn : sDefFont, scheme : EFontScheme.fontschemeNone, fs : 11, @@ -6881,25 +6885,25 @@ i : false, u : EUnderline.underlineNone, s : false, - c : g_oColorManager.getThemeColor(g_nColorTextDefault), + c : AscCommonExcel.g_oColorManager.getThemeColor(AscCommonExcel.g_nColorTextDefault), va : "baseline", skip : false, repeat : false }); - g_oDefaultFill = g_oDefaultFillAbs = new Fill({bg : null}); - g_oDefaultBorder = g_oDefaultBorderAbs = new Border({ - l : new BorderProp(), - t : new BorderProp(), - r : new BorderProp(), - b : new BorderProp(), - d : new BorderProp(), - ih : new BorderProp(), - iv : new BorderProp(), + g_oDefaultFormat.Fill = g_oDefaultFormat.FillAbs = new AscCommonExcel.Fill({bg : null}); + g_oDefaultFormat.Border = g_oDefaultFormat.BorderAbs = new AscCommonExcel.Border({ + l : new AscCommonExcel.BorderProp(), + t : new AscCommonExcel.BorderProp(), + r : new AscCommonExcel.BorderProp(), + b : new AscCommonExcel.BorderProp(), + d : new AscCommonExcel.BorderProp(), + ih : new AscCommonExcel.BorderProp(), + iv : new AscCommonExcel.BorderProp(), dd : false, du : false }); - g_oDefaultNum = g_oDefaultNumAbs = new Num({f : "General"}); - g_oDefaultAlign = g_oDefaultAlignAbs = new Align({ + g_oDefaultFormat.Num = g_oDefaultFormat.NumAbs = new AscCommonExcel.Num({f : "General"}); + g_oDefaultFormat.Align = g_oDefaultFormat.AlignAbs = new AscCommonExcel.Align({ hor : "none", indent : 0, RelativeIndent : 0, @@ -7535,7 +7539,7 @@ var styles = {}; for(var i in configs) { - styles[i] = new CellXfs(); + styles[i] = new AscCommonExcel.CellXfs(); } this._compileOption(options, headerRowCount, totalsRowCount, styles, configs); this.compiled.options[nBitMask] = styles; @@ -7547,7 +7551,7 @@ if(null != inputDxf && null != inputDxf.border) { var oCurBorder = inputDxf.border; - var oNewBorder = new Border(); + var oNewBorder = new AscCommonExcel.Border(); if(bLeft) oNewBorder.l = oCurBorder.l; else if(bInnerVer) @@ -7576,7 +7580,7 @@ if(null != inputDxf && null != inputDxf.border) { var oCurBorder = inputDxf.border; - var oNewBorder = new Border(); + var oNewBorder = new AscCommonExcel.Border(); if(bHeader) oNewBorder.t = oCurBorder.b; else @@ -7982,18 +7986,18 @@ return oBinary_StylesTableReader.ReadXfs(t, l, oStyleObject.xfs); }); } else if (Types.Font === type) { - oStyleObject.font = new Font(); + oStyleObject.font = new AscCommonExcel.Font(); res = bcr.Read2Spreadsheet(length, function (t, l) { return oBinary_StylesTableReader.bssr.ReadRPr(t, l, oStyleObject.font); }); oBinary_StylesTableReader.bssr.CheckSchemeFont(oStyleObject.font); } else if (Types.Fill === type) { - oStyleObject.fill = new Fill(); + oStyleObject.fill = new AscCommonExcel.Fill(); res = bcr.Read1(length, function (t, l) { return oBinary_StylesTableReader.ReadFill(t, l, oStyleObject.fill); }); } else if (Types.Border === type) { - oStyleObject.border = new Border(); + oStyleObject.border = new AscCommonExcel.Border(); res = bcr.Read1(length, function (t, l) { return oBinary_StylesTableReader.ReadBorder(t, l, oStyleObject.border); }); @@ -8009,12 +8013,12 @@ var res = c_oSerConstants.ReadOk; var oStyleObject = {font: null, fill: null, border: null, oNumFmts: [], xfs: null}; if (Types.Style === type) { - var oCellStyle = new CCellStyle(); + var oCellStyle = new AscCommonExcel.CCellStyle(); res = bcr.Read1(length, function (t, l) { return fReadStyle(t,l, oCellStyle, oStyleObject); }); - oCellStyle.xfs = new CellXfs(); + oCellStyle.xfs = new AscCommonExcel.CellXfs(); // Border if (null !== oStyleObject.border) oCellStyle.xfs.border = oStyleObject.border.clone(); @@ -8070,11 +8074,12 @@ wb.CellStyles.CustomStyles[0].XfId = 0; } // Если XfId не задан, то определим его - if (null == g_oDefaultXfId) { - g_oDefaultXfId = 0; + if (null == g_oDefaultFormat.XfId) { + g_oDefaultFormat.XfId = 0; } } + window['Asc'] = window['Asc'] || {}; window["Asc"].c_oSerFormat = c_oSerFormat; window["Asc"].EBorderStyle = EBorderStyle; window["Asc"].EUnderline = EUnderline; @@ -8106,5 +8111,4 @@ window["Asc"].BinaryFileWriter = BinaryFileWriter; window["Asc"].getBinaryOtherTableGVar = getBinaryOtherTableGVar; -} - )(window); \ No newline at end of file +})(window); diff --git a/cell/model/UndoRedo.js b/cell/model/UndoRedo.js index 60769fef7d..32810ddf9f 100644 --- a/cell/model/UndoRedo.js +++ b/cell/model/UndoRedo.js @@ -419,8 +419,8 @@ var UndoRedoDataTypes = new function() { { switch(nType) { - case this.ValueMultiTextElem: return new CCellValueMultiText();break; - case this.CellValue:return new CCellValue();break; + case this.ValueMultiTextElem: return new AscCommonExcel.CCellValueMultiText();break; + case this.CellValue:return new AscCommonExcel.CCellValue();break; case this.CellValueData: return new UndoRedoData_CellValueData();break; case this.CellData: return new UndoRedoData_CellData();break; case this.CellSimpleData: return new UndoRedoData_CellSimpleData();break; @@ -431,15 +431,15 @@ var UndoRedoDataTypes = new function() { case this.ColProp: return new UndoRedoData_ColProp();break; case this.RowProp: return new UndoRedoData_RowProp();break; case this.BBox: return new UndoRedoData_BBox();break; - case this.Hyperlink: return new Hyperlink();break; + case this.Hyperlink: return new AscCommonExcel.Hyperlink();break; case this.SortData: return new UndoRedoData_SortData();break; - case this.StyleFont: return new Font();break; - case this.StyleFill: return new Fill();break; - case this.StyleNum: return new Num();break; - case this.StyleBorder: return new Border();break; - case this.StyleBorderProp: return new BorderProp();break; - case this.StyleXfs: return new CellXfs();break; - case this.StyleAlign: return new Align();break; + case this.StyleFont: return new AscCommonExcel.Font();break; + case this.StyleFill: return new AscCommonExcel.Fill();break; + case this.StyleNum: return new AscCommonExcel.Num();break; + case this.StyleBorder: return new AscCommonExcel.Border();break; + case this.StyleBorderProp: return new AscCommonExcel.BorderProp();break; + case this.StyleXfs: return new AscCommonExcel.CellXfs();break; + case this.StyleAlign: return new AscCommonExcel.Align();break; case this.CommentData: return new Asc.asc_CCommentData();break; case this.CompositeCommentData: return new AscCommonExcel.CompositeCommentData();break; case this.ChartSeriesData: return new AscFormat.asc_CChartSeria();break; @@ -455,8 +455,8 @@ var UndoRedoDataTypes = new function() { case this.AutoFiltersOptionsElements: return new AscCommonExcel.AutoFiltersOptionsElements(); break; case this.AddFormatTableOptions: return new AscCommonExcel.AddFormatTableOptions(); break; case this.SingleProperty: return new UndoRedoData_SingleProperty(); break; - case this.RgbColor: return new RgbColor(); break; - case this.ThemeColor: return new ThemeColor(); break; + case this.RgbColor: return new AscCommonExcel.RgbColor(); break; + case this.ThemeColor: return new AscCommonExcel.ThemeColor(); break; case this.SheetViewSettings: return new AscCommonExcel.asc_CSheetViewSettings(); break; case this.GraphicObjects: return new UndoRedoDataGraphicObjects();break; case this.GlobalTableIdAdd: return new UndoRedoData_GTableIdAdd(); break; @@ -877,8 +877,8 @@ function UndoRedoData_RowProp(row){ if(null != row) { this.h = row.h; - this.hd = 0 != (g_nRowFlag_hd & row.flags); - this.CustomHeight = 0 != (g_nRowFlag_CustomHeight & row.flags); + this.hd = 0 != (AscCommonExcel.g_nRowFlag_hd & row.flags); + this.CustomHeight = 0 != (AscCommonExcel.g_nRowFlag_CustomHeight & row.flags); } else { diff --git a/cell/model/Workbook.js b/cell/model/Workbook.js index 20b3c7deac..866d586a7c 100644 --- a/cell/model/Workbook.js +++ b/cell/model/Workbook.js @@ -26,6 +26,10 @@ var UndoRedoData_SheetAdd = AscCommonExcel.UndoRedoData_SheetAdd; var UndoRedoData_SheetPositions = AscCommonExcel.UndoRedoData_SheetPositions; var UndoRedoData_DefinedNames = AscCommonExcel.UndoRedoData_DefinedNames; var UndoRedoData_DefinedNamesChange = AscCommonExcel.UndoRedoData_DefinedNamesChange; +var g_oDefaultFormat = AscCommonExcel.g_oDefaultFormat; +var Border = AscCommonExcel.Border; +var RangeDataManagerElem = AscCommonExcel.RangeDataManagerElem; +var RangeDataManager = AscCommonExcel.RangeDataManager; var cElementType = AscCommonExcel.cElementType; var cArea3D = AscCommonExcel.cArea3D; @@ -147,7 +151,7 @@ DependencyGraph.prototype = { else { var nodesSheetCell = this.nodesCell[node.sheetId]; if ( null == nodesSheetCell ) { - nodesSheetCell = new CellArea(function(data, from, to){_this._changeNode(data, from, to);}); + nodesSheetCell = new AscCommonExcel.CellArea(function(data, from, to){_this._changeNode(data, from, to);}); this.nodesCell[node.sheetId] = nodesSheetCell; } nodesSheetCell.add( oBBoxNode.r1, oBBoxNode.c1, node ); @@ -287,7 +291,7 @@ DependencyGraph.prototype = { toDelete = offset.offsetCol < 0 || offset.offsetRow < 0, bSetRefErrorOld = this.bSetRefError; this.bSetRefError = true; - var oShiftGetBBox = shiftGetBBox(BBox, bHor); + var oShiftGetBBox = AscCommonExcel.shiftGetBBox(BBox, bHor); var sShiftGetBBoxName = oShiftGetBBox.getName(); this.wb.needRecalc.nodes[getVertexId(wsId, sShiftGetBBoxName)] = [wsId, sShiftGetBBoxName]; this.wb.needRecalc.length++; @@ -742,7 +746,7 @@ DependencyGraph.prototype = { if (node && oSheetWithArea[node.sheetId] && !oRes.oMasterNodes[node.nodeId]) { var oCellsForCalculationSheet = oCellsForCalculation[node.sheetId]; if (null == oCellsForCalculationSheet) { - oCellsForCalculationSheet = new CellArea(null); + oCellsForCalculationSheet = new AscCommonExcel.CellArea(null); oCellsForCalculation[node.sheetId] = oCellsForCalculationSheet; } var bbox = node.getBBox(); @@ -2035,9 +2039,9 @@ function Workbook(eventsHandlers, oApi){ this.DefinedNames = {}; this.oRealDefinedNames = {}; // this.oNameGenerator = new NameGenerator(this); - this.CellStyles = new CCellStyles(); + this.CellStyles = new AscCommonExcel.CCellStyles(); this.TableStyles = new Asc.CTableStyles(); - this.oStyleManager = new StyleManager(); + this.oStyleManager = new AscCommonExcel.StyleManager(); this.calcChain = []; this.aComments = []; // Комментарии к документу this.aCommentsCoords = []; @@ -2093,15 +2097,15 @@ Workbook.prototype.init=function(bNoBuildDep){ }; Workbook.prototype.rebuildColors=function(){ - g_oColorManager.rebuildColors(); + AscCommonExcel.g_oColorManager.rebuildColors(); for(var i = 0 , length = this.aWorksheets.length; i < length; ++i) this.aWorksheets[i].rebuildColors(); }; Workbook.prototype.getDefaultFont=function(){ - return g_oDefaultFont.fn; + return g_oDefaultFormat.Font.fn; }; Workbook.prototype.getDefaultSize=function(){ - return g_oDefaultFont.fs; + return g_oDefaultFormat.Font.fs; }; Workbook.prototype.getActive=function(){ return this.nActive; @@ -2507,8 +2511,8 @@ Workbook.prototype._generateFontMap=function(){ "Arial" : 1 }; - if(null != g_oDefaultFont.fn) - oFontMap[g_oDefaultFont.fn] = 1; + if(null != g_oDefaultFormat.Font.fn) + oFontMap[g_oDefaultFormat.Font.fn] = 1; for(var i = 0, length = this.aWorksheets.length; i < length; ++i) this.aWorksheets[i].generateFontMap(oFontMap); @@ -3128,7 +3132,7 @@ function Woorksheet(wb, _index, sId){ this.DefinedNames = {}; this.sName = this.workbook.getUniqueSheetNameFrom(g_sNewSheetNamePattern, false); this.bHidden = false; - this.oSheetFormatPr = new SheetFormatPr(); + this.oSheetFormatPr = new AscCommonExcel.SheetFormatPr(); this.index = _index; this.Id = null != sId ? sId : AscCommon.g_oIdCounter.Get_NewId(); this.nRowsCount = 0; @@ -3201,7 +3205,7 @@ function Woorksheet(wb, _index, sId){ this.oDrawingOjectsManager = new DrawingObjectsManager(this); this.contentChanges = new AscCommon.CContentChanges(); - this.sparklineGroups = new sparklineGroups(); + this.sparklineGroups = new AscCommonExcel.sparklineGroups(); /*handlers*/ this.handlers = null; @@ -3491,8 +3495,8 @@ Woorksheet.prototype._updateConditionalFormatting = function(range) { oGradient.init(min, max); for (cell = 0; cell < arrayCells.length; ++cell) { - var dxf = new CellXfs(); - dxf.fill = new Fill({bg: oGradient.calculateColor(arrayCells[cell].val)}); + var dxf = new AscCommonExcel.CellXfs(); + dxf.fill = new AscCommonExcel.Fill({bg: oGradient.calculateColor(arrayCells[cell].val)}); arrayCells[cell].cell.setConditionalFormattingStyle(dxf); } } @@ -3782,7 +3786,7 @@ Woorksheet.prototype._insertRowsBefore=function(index, count){ { var row = this._getRow(index + i); row.copyProperty(oPrevRow); - row.flags &= ~g_nRowFlag_hd; + row.flags &= ~AscCommonExcel.g_nRowFlag_hd; } History.LocalChange = false; } @@ -4143,7 +4147,7 @@ Woorksheet.prototype.setColBestFit=function(bBestFit, width, start, stop){ } }; Woorksheet.prototype.isDefaultHeightHidden=function(){ - return null != this.oSheetFormatPr.oAllRow && 0 != (g_nRowFlag_hd & this.oSheetFormatPr.oAllRow.flags); + return null != this.oSheetFormatPr.oAllRow && 0 != (AscCommonExcel.g_nRowFlag_hd & this.oSheetFormatPr.oAllRow.flags); }; Woorksheet.prototype.isDefaultWidthHidden=function(){ return null != this.oAllCol && this.oAllCol.hd; @@ -4152,7 +4156,7 @@ Woorksheet.prototype.getDefaultHeight=function(){ // ToDo http://bugzserver/show_bug.cgi?id=19666 (флага CustomHeight нет) var dRes = null; // Нужно возвращать выставленную, только если флаг CustomHeight = true - if(null != this.oSheetFormatPr.oAllRow && 0 != (g_nRowFlag_CustomHeight & this.oSheetFormatPr.oAllRow.flags)) + if(null != this.oSheetFormatPr.oAllRow && 0 != (AscCommonExcel.g_nRowFlag_CustomHeight & this.oSheetFormatPr.oAllRow.flags)) dRes = this.oSheetFormatPr.oAllRow.h; return dRes; }; @@ -4189,9 +4193,9 @@ Woorksheet.prototype.setRowHeight=function(height, start, stop, isCustom){ var oOldProps = row.getHeightProp(); row.h = height; if (isCustom) { - row.flags |= g_nRowFlag_CustomHeight; + row.flags |= AscCommonExcel.g_nRowFlag_CustomHeight; } - row.flags &= ~g_nRowFlag_hd; + row.flags &= ~AscCommonExcel.g_nRowFlag_hd; var oNewProps = row.getHeightProp(); if(false === oOldProps.isEqual(oNewProps)) History.Add(AscCommonExcel.g_oUndoRedoWorksheet, AscCH.historyitem_Worksheet_RowProp, oThis.getId(), row._getUpdateRange(), new UndoRedoData_IndexSimpleProp(row.index, true, oOldProps, oNewProps)); @@ -4213,7 +4217,7 @@ Woorksheet.prototype.setRowHeight=function(height, start, stop, isCustom){ }; Woorksheet.prototype.getRowHidden=function(index){ var row = this._getRowNoEmptyWithAll(index); - return row ? 0 != (g_nRowFlag_hd & row.flags) : false; + return row ? 0 != (AscCommonExcel.g_nRowFlag_hd & row.flags) : false; }; Woorksheet.prototype.setRowHidden=function(bHidden, start, stop){ //start, stop 0 based @@ -4226,12 +4230,12 @@ Woorksheet.prototype.setRowHidden=function(bHidden, start, stop){ var startIndex = null, endIndex = null, updateRange; var fProcessRow = function(row){ - if(row && bHidden != (0 != (g_nRowFlag_hd & row.flags))) + if(row && bHidden != (0 != (AscCommonExcel.g_nRowFlag_hd & row.flags))) { if(bHidden) - row.flags |= g_nRowFlag_hd; + row.flags |= AscCommonExcel.g_nRowFlag_hd; else - row.flags &= ~g_nRowFlag_hd; + row.flags &= ~AscCommonExcel.g_nRowFlag_hd; if(row.index === endIndex + 1 && startIndex !== null) @@ -4279,9 +4283,9 @@ Woorksheet.prototype.setRowBestFit=function(bBestFit, height, start, stop){ { var oOldProps = row.getHeightProp(); if(true == bBestFit) - row.flags &= ~g_nRowFlag_CustomHeight; + row.flags &= ~AscCommonExcel.g_nRowFlag_CustomHeight; else - row.flags |= g_nRowFlag_CustomHeight; + row.flags |= AscCommonExcel.g_nRowFlag_CustomHeight; row.h = height; var oNewProps = row.getHeightProp(); if(false == oOldProps.isEqual(oNewProps)) @@ -4450,7 +4454,7 @@ Woorksheet.prototype._getRow=function(row){ if (null != this.oSheetFormatPr.oAllRow) oCurRow = this.oSheetFormatPr.oAllRow.clone(this); else - oCurRow = new Row(this); + oCurRow = new AscCommonExcel.Row(this); oCurRow.create(row + 1); this.aGCells[row] = oCurRow; this.nRowsCount = row >= this.nRowsCount ? row + 1 : this.nRowsCount; @@ -4478,7 +4482,7 @@ Woorksheet.prototype._getCol=function(index){ oCurCol.index = index; } else - oCurCol = new Col(this, index); + oCurCol = new AscCommonExcel.Col(this, index); this.aCols[index] = oCurCol; this.nColsCount = index >= this.nColsCount ? index + 1 : this.nColsCount; //History.Add(AscCommonExcel.g_oUndoRedoWorksheet, AscCH.historyitem_Worksheet_CreateCol, this.getId(), null, new UndoRedoData_SingleProperty(index)); @@ -5164,7 +5168,7 @@ Woorksheet.prototype._RecalculatedFunctions=function(cell,bad,setCellFormat){ r = r[0]; if ( r && r.getNumFormatStr ) { var sCurFormat = c.getNumFormatStr(); - if ( g_oDefaultNum.f == sCurFormat ) { + if ( g_oDefaultFormat.Num.f == sCurFormat ) { var sNewFormat = r.getNumFormatStr(); if ( sCurFormat != sNewFormat ) c.setNumFormat( sNewFormat ); @@ -5267,12 +5271,12 @@ Woorksheet.prototype.renameDependencyNodes = function(offset, oBBox, rec, noDele }; Woorksheet.prototype.getAllCol = function(){ if(null == this.oAllCol) - this.oAllCol = new Col(this, g_nAllColIndex); + this.oAllCol = new AscCommonExcel.Col(this, g_nAllColIndex); return this.oAllCol; }; Woorksheet.prototype.getAllRow = function(){ if (null == this.oSheetFormatPr.oAllRow) { - this.oSheetFormatPr.oAllRow = new Row(this); + this.oSheetFormatPr.oAllRow = new AscCommonExcel.Row(this); this.oSheetFormatPr.oAllRow.create(g_nAllRowIndex + 1); } return this.oSheetFormatPr.oAllRow; @@ -5331,7 +5335,7 @@ Woorksheet.prototype.expandRangeByMerged = function(range){ }; Woorksheet.prototype.createTablePart = function(){ - return new TablePart(this.handlers); + return new AscCommonExcel.TablePart(this.handlers); }; //------------------------------------------------------------------------------------------------- /** @@ -5339,7 +5343,7 @@ Woorksheet.prototype.createTablePart = function(){ */ function Cell(worksheet){ this.ws = worksheet; - this.oValue = new CCellValue(); + this.oValue = new AscCommonExcel.CCellValue(); this.xfs = null; this.tableXfs = null; this.conditionalFormattingXfs = null; @@ -5447,7 +5451,7 @@ Cell.prototype.setValue=function(val,callback, isCopyPaste){ if(null != this.xfs && null != this.xfs.num) sNumFormat = this.xfs.num.f; else - sNumFormat = g_oDefaultNum.f; + sNumFormat = g_oDefaultFormat.Num.f; var numFormat = oNumFormatCache.get(sNumFormat); bIsTextFormat = numFormat.isTextFormat(); } @@ -5629,7 +5633,7 @@ Cell.prototype.shiftNumFormat=function(nShift, dDigitsCount){ if(null != this.xfs && null != this.xfs.num) sNumFormat = this.xfs.num.f; else - sNumFormat = g_oDefaultNum.f; + sNumFormat = g_oDefaultFormat.Num.f; if("General" != sNumFormat) { var oCurNumFormat = oNumFormatCache.get(sNumFormat); @@ -5882,7 +5886,7 @@ Cell.prototype.getValue2=function(dDigitsCount, fIsFitMeasurer){ Cell.prototype.getNumFormatStr=function(){ if(null != this.xfs && null != this.xfs.num) return this.xfs.num.f; - return g_oDefaultNum.f; + return g_oDefaultFormat.Num.f; }; Cell.prototype.getNumFormat=function(){ return oNumFormatCache.get(this.getNumFormatStr()); @@ -6754,7 +6758,7 @@ Range.prototype._setCellBorder=function(bbox, cell, oNewBorder){ if(null != cell.xfs && null != cell.xfs.border) oCurBorder = cell.xfs.border.clone(); else - oCurBorder = g_oDefaultBorder.clone(); + oCurBorder = g_oDefaultFormat.Border.clone(); var nRow = cell.nRow; var nCol = cell.nCol; cell.setBorder(this._setBorderMerge(nCol == bbox.c1, nRow == bbox.r1, nCol == bbox.c2, nRow == bbox.r2, oNewBorder, oCurBorder)); @@ -6799,7 +6803,7 @@ Range.prototype._setBorderEdge=function(bbox, oItemWithXfs, nRow, nCol, oNewBord oCurBorderProp = oCurBorder.t; var oNewBorderProp = null; if(null == oNewBorder) - oNewBorderProp = new BorderProp(); + oNewBorderProp = new AscCommonExcel.BorderProp(); else { if(nCol == bbox.c1 - 1) @@ -6816,13 +6820,13 @@ Range.prototype._setBorderEdge=function(bbox, oItemWithXfs, nRow, nCol, oNewBord (oNewBorderProp.s != oCurBorderProp.s || oNewBorderProp.getRgbOrNull() != oCurBorderProp.getRgbOrNull())){ var oTargetBorder = oCurBorder.clone(); if(nCol == bbox.c1 - 1) - oTargetBorder.r = new BorderProp(); + oTargetBorder.r = new AscCommonExcel.BorderProp(); else if(nRow == bbox.r1 - 1) - oTargetBorder.b = new BorderProp(); + oTargetBorder.b = new AscCommonExcel.BorderProp(); else if(nCol == bbox.c2 + 1) - oTargetBorder.l = new BorderProp(); + oTargetBorder.l = new AscCommonExcel.BorderProp(); else if(nRow == bbox.r2 + 1) - oTargetBorder.t = new BorderProp(); + oTargetBorder.t = new AscCommonExcel.BorderProp(); oItemWithXfs.setBorder(oTargetBorder); } } @@ -7089,13 +7093,13 @@ Range.prototype.getXfId=function(){ if(null != col && null != col.xfs && null != col.xfs.XfId) return col.xfs.XfId; } - return g_oDefaultXfId; + return g_oDefaultFormat.XfId; }; Range.prototype.getStyleName=function(){ var res = this.worksheet.workbook.CellStyles.getStyleNameByXfId(this.getXfId()); // ToDo убрать эту заглушку (нужно делать на открытии) в InitStyleManager - return res || this.worksheet.workbook.CellStyles.getStyleNameByXfId(g_oDefaultXfId); + return res || this.worksheet.workbook.CellStyles.getStyleNameByXfId(g_oDefaultFormat.XfId); }; Range.prototype.getTableStyle=function(){ var cell = this.worksheet._getCellNoEmpty(this.bbox.r1,this.bbox.c1); @@ -7124,7 +7128,7 @@ Range.prototype.getNumFormatStr=function(){ if(null != col && null != col.xfs && null != col.xfs.num) return col.xfs.num.f; } - return g_oDefaultNum.f; + return g_oDefaultFormat.Num.f; }; Range.prototype.getNumFormatType=function(){ return this.getNumFormat().getType(); @@ -7133,7 +7137,7 @@ Range.prototype.getNumFormatType=function(){ Range.prototype.isNotDefaultFont = function () { // Получаем фонт ячейки var cellFont = this.getFont(); - var rowFont = g_oDefaultFont; + var rowFont = g_oDefaultFormat.Font; var row = this.worksheet._getRowNoEmpty(this.bbox.r1); if (null != row && null != row.xfs && null != row.xfs.font) rowFont = row.xfs.font; @@ -7162,7 +7166,7 @@ Range.prototype.getFont = function(){ if(null != col && null != col.xfs && null != col.xfs.font) return col.xfs.font; } - return g_oDefaultFont; + return g_oDefaultFormat.Font; }; Range.prototype.getFontname=function(){ return this.getFont().fn; @@ -7212,7 +7216,7 @@ Range.prototype.getAlignVertical=function(){ if(null != xfs.align) return xfs.align.ver; else - return g_oDefaultAlignAbs.ver; + return g_oDefaultFormat.AlignAbs.ver; } } else @@ -7225,7 +7229,7 @@ Range.prototype.getAlignVertical=function(){ if(null != col && null != col.xfs && null != col.xfs.align) return col.xfs.align.ver; } - return g_oDefaultAlign.ver; + return g_oDefaultFormat.Align.ver; }; Range.prototype.getAlignHorizontal=function(){ var nRow = this.bbox.r1; @@ -7239,7 +7243,7 @@ Range.prototype.getAlignHorizontal=function(){ if(null != xfs.align) return xfs.align.hor; else - return g_oDefaultAlignAbs.hor; + return g_oDefaultFormat.AlignAbs.hor; } } else @@ -7252,7 +7256,7 @@ Range.prototype.getAlignHorizontal=function(){ if(null != col && null != col.xfs && null != col.xfs.align) return col.xfs.align.hor; } - return g_oDefaultAlign.hor; + return g_oDefaultFormat.Align.hor; }; Range.prototype.getAlignHorizontalByValue=function(){ //возвращает Align в зависимости от значния в ячейке @@ -7309,7 +7313,7 @@ Range.prototype.getFill=function(){ if(null != col && null != col.xfs && null != col.xfs.fill) return col.xfs.fill.bg; } - return g_oDefaultFill.bg; + return g_oDefaultFormat.Fill.bg; }; Range.prototype.getBorderSrc=function(_cell){ //Возвращает как записано в файле, не проверяя бордеры соседних ячеек @@ -7339,7 +7343,7 @@ Range.prototype.getBorderSrc=function(_cell){ if(null != col && null != col.xfs && null != col.xfs.border) return col.xfs.border; } - return g_oDefaultBorder; + return g_oDefaultFormat.Border; }; Range.prototype.getBorder=function(_cell){ //_cell - optional @@ -7353,7 +7357,7 @@ Range.prototype.getBorder=function(_cell){ if(null != oRes) return oRes; else - return g_oDefaultBorder; + return g_oDefaultFormat.Border; }; Range.prototype.getBorderFull=function(){ //Возвращает как excel, т.е. проверяет бордеры соседних ячеек @@ -7404,7 +7408,7 @@ Range.prototype.getShrinkToFit=function(){ if(null != xfs.align) return xfs.align.shrink; else - return g_oDefaultAlignAbs.shrink; + return g_oDefaultFormat.AlignAbs.shrink; } } else @@ -7417,7 +7421,7 @@ Range.prototype.getShrinkToFit=function(){ if(null != col && null != col.xfs && null != col.xfs.align) return col.xfs.align.shrink; } - return g_oDefaultAlign.shrink; + return g_oDefaultFormat.Align.shrink; }; Range.prototype.getWrapByAlign = function (align) { // Для justify wrap всегда true @@ -7433,7 +7437,7 @@ Range.prototype.getWrap=function(){ if(null != xfs.align) return this.getWrapByAlign(xfs.align); else - return this.getWrapByAlign(g_oDefaultAlignAbs); + return this.getWrapByAlign(g_oDefaultFormat.AlignAbs); } } else { //стили столбов и колонок @@ -7444,7 +7448,7 @@ Range.prototype.getWrap=function(){ if(null != col && null != col.xfs && null != col.xfs.align) return this.getWrapByAlign(col.xfs.align); } - return this.getWrapByAlign(g_oDefaultAlign); + return this.getWrapByAlign(g_oDefaultFormat.Align); }; Range.prototype.getAngle=function(){ //угол от -90 до 90 против часовой стрелки от оси OX @@ -7459,7 +7463,7 @@ Range.prototype.getAngle=function(){ if(null != xfs.align) return angleFormatToInterface(xfs.align.angle); else - return angleFormatToInterface(g_oDefaultAlignAbs.angle); + return angleFormatToInterface(g_oDefaultFormat.AlignAbs.angle); } } else @@ -7472,7 +7476,7 @@ Range.prototype.getAngle=function(){ if(null != col && null != col.xfs && null != col.xfs.align) return angleFormatToInterface(col.xfs.align.angle); } - return angleFormatToInterface(g_oDefaultAlign.angle); + return angleFormatToInterface(g_oDefaultFormat.Align.angle); }; Range.prototype.getVerticalText=function(){ var nRow = this.bbox.r1; @@ -7486,7 +7490,7 @@ Range.prototype.getVerticalText=function(){ if(null != xfs.align) return g_nVerticalTextAngle == xfs.align.angle; else - return g_nVerticalTextAngle == g_oDefaultAlignAbs.angle; + return g_nVerticalTextAngle == g_oDefaultFormat.AlignAbs.angle; } } else @@ -7499,7 +7503,7 @@ Range.prototype.getVerticalText=function(){ if(null != col && null != col.xfs && null != col.xfs.align) return g_nVerticalTextAngle == col.xfs.align.angle; } - return g_nVerticalTextAngle == g_oDefaultAlign.angle; + return g_nVerticalTextAngle == g_oDefaultFormat.Align.angle; }; Range.prototype.hasMerged=function(){ var aMerged = this.worksheet.mergeManager.get(this.bbox); @@ -7682,7 +7686,7 @@ Range.prototype.merge=function(type){ oTargetStyle.border = null; } else if(null != oLeftBorder || null != oTopBorder || null != oRightBorder || null != oBottomBorder) - oTargetStyle = new CellXfs(); + oTargetStyle = new AscCommonExcel.CellXfs(); var fSetProperty = this._setProperty; var nRangeType = this._getRangeType(); if(c_oRangeType.All == nRangeType) @@ -7945,11 +7949,11 @@ Range.prototype.setHyperlink=function(val, bWithoutStyle){ //todo перейти на CellStyle if(true != bWithoutStyle) { - var oHyperlinkFont = new Font(); + var oHyperlinkFont = new AscCommonExcel.Font(); oHyperlinkFont.fn = this.worksheet.workbook.getDefaultFont(); oHyperlinkFont.fs = this.worksheet.workbook.getDefaultSize(); oHyperlinkFont.u = Asc.EUnderline.underlineSingle; - oHyperlinkFont.c = g_oColorManager.getThemeColor(g_nColorHyperlink); + oHyperlinkFont.c = AscCommonExcel.g_oColorManager.getThemeColor(AscCommonExcel.g_nColorHyperlink); this.setFont(oHyperlinkFont); } if(false == this.worksheet.workbook.bUndoChanges && false == this.worksheet.workbook.bRedoChanges) @@ -8375,7 +8379,7 @@ Range.prototype.sort=function(nOption, nStartCol, colorText, colorFill){ var row = oThis.worksheet._getRowNoEmpty(nRow0); if(null != row) { - if(0 != (g_nRowFlag_hd & row.flags)) + if(0 != (AscCommonExcel.g_nRowFlag_hd & row.flags)) aHiddenRow[nRow0] = 1; else { diff --git a/cell/model/WorkbookElems.js b/cell/model/WorkbookElems.js index 07e15257cd..669bf821d2 100644 --- a/cell/model/WorkbookElems.js +++ b/cell/model/WorkbookElems.js @@ -1,5 +1,7 @@ "use strict"; +(function(window, undefined){ + // Import var CellValueType = AscCommon.CellValueType; var c_oAscBorderWidth = AscCommon.c_oAscBorderWidth; @@ -23,28 +25,25 @@ var c_oAscAutoFilterTypes = Asc.c_oAscAutoFilterTypes; var c_oAscNumFormatType = Asc.c_oAscNumFormatType; var g_oColorManager = null; -var g_nNumsMaxId = 160; -var g_oDefaultXfId = null; -var g_oDefaultFont = null; -var g_oDefaultFill = null; -var g_oDefaultNum = null; -var g_oDefaultBorder = null; -var g_oDefaultAlign = null; -var g_oDefaultFontAbs = null; -var g_oDefaultFillAbs = null; -var g_oDefaultNumAbs = null; -var g_oDefaultBorderAbs = null; -var g_oDefaultAlignAbs = null; + + var g_oDefaultFormat = { + XfId: null, + Font: null, + Fill: null, + Num: null, + Border: null, + Align: null, + FontAbs: null, + FillAbs: null, + NumAbs: null, + BorderAbs: null, + AlignAbs: null + }; var g_nColorTextDefault = 1; var g_nColorHyperlink = 10; var g_nColorHyperlinkVisited = 11; -var g_nFiltersType = { - autoFilter: 1, - tablePart: 2 -}; - var g_oThemeColorsDefaultModsSpreadsheet = [ [0, -4.9989318521683403E-2, -0.14999847407452621, -0.249977111117893, -0.34998626667073579, -0.499984740745262], [0, -9.9978637043366805E-2, -0.249977111117893, -0.499984740745262, -0.749992370372631, -0.89999084444715716], @@ -66,11 +65,6 @@ var map_themeExcel_to_themePresentation = { 10: 11, 11: 10 }; -var map_themePresentation_to_themeExcel = {}; -(function(){ - for(var i in map_themeExcel_to_themePresentation) - map_themePresentation_to_themeExcel[map_themeExcel_to_themePresentation[i]] = i - 0; -})(); function shiftGetBBox(bbox, bHor) { var bboxGet = null; @@ -437,7 +431,7 @@ var g_oFontProperties = { function Font(val) { if(null == val) - val = g_oDefaultFontAbs; + val = g_oDefaultFormat.FontAbs; this.Properties = g_oFontProperties; this.fn = val.fn; this.scheme = val.scheme; @@ -477,22 +471,23 @@ Font.prototype = }, merge : function(font) { + var defaultFontAbs = g_oDefaultFormat.FontAbs; var oRes = new Font(); - oRes.fn = this._mergeProperty(this.fn, font.fn, g_oDefaultFontAbs.fn); - oRes.scheme = this._mergeProperty(this.scheme, font.scheme, g_oDefaultFontAbs.scheme); - oRes.fs = this._mergeProperty(this.fs, font.fs, g_oDefaultFontAbs.fs); - oRes.b = this._mergeProperty(this.b, font.b, g_oDefaultFontAbs.b); - oRes.i = this._mergeProperty(this.i, font.i, g_oDefaultFontAbs.i); - oRes.u = this._mergeProperty(this.u, font.u, g_oDefaultFontAbs.u); - oRes.s = this._mergeProperty(this.s, font.s, g_oDefaultFontAbs.s); + oRes.fn = this._mergeProperty(this.fn, font.fn, defaultFontAbs.fn); + oRes.scheme = this._mergeProperty(this.scheme, font.scheme, defaultFontAbs.scheme); + oRes.fs = this._mergeProperty(this.fs, font.fs, defaultFontAbs.fs); + oRes.b = this._mergeProperty(this.b, font.b, defaultFontAbs.b); + oRes.i = this._mergeProperty(this.i, font.i, defaultFontAbs.i); + oRes.u = this._mergeProperty(this.u, font.u, defaultFontAbs.u); + oRes.s = this._mergeProperty(this.s, font.s, defaultFontAbs.s); //заглушка excel при merge стилей игнорирует default цвет if(this.c instanceof ThemeColor && g_nColorTextDefault == this.c.theme && null == this.c.tint) - oRes.c = this._mergeProperty(font.c, this.c, g_oDefaultFontAbs.c); + oRes.c = this._mergeProperty(font.c, this.c, defaultFontAbs.c); else - oRes.c = this._mergeProperty(this.c, font.c, g_oDefaultFontAbs.c); - oRes.va = this._mergeProperty(this.va, font.va, g_oDefaultFontAbs.va); - oRes.skip = this._mergeProperty(this.skip, font.skip, g_oDefaultFontAbs.skip); - oRes.repeat = this._mergeProperty(this.repeat, font.repeat, g_oDefaultFontAbs.repeat); + oRes.c = this._mergeProperty(this.c, font.c, defaultFontAbs.c); + oRes.va = this._mergeProperty(this.va, font.va, defaultFontAbs.va); + oRes.skip = this._mergeProperty(this.skip, font.skip, defaultFontAbs.skip); + oRes.repeat = this._mergeProperty(this.repeat, font.repeat, defaultFontAbs.repeat); return oRes; }, getRgbOrNull : function() @@ -671,7 +666,7 @@ var g_oFillProperties = { function Fill(val) { if(null == val) - val = g_oDefaultFillAbs; + val = g_oDefaultFormat.FillAbs; this.Properties = g_oFillProperties; this.bg = val.bg; } @@ -687,7 +682,7 @@ Fill.prototype = merge : function(fill) { var oRes = new Fill(); - oRes.bg = this._mergeProperty(this.bg, fill.bg, g_oDefaultFill.bg); + oRes.bg = this._mergeProperty(this.bg, fill.bg, g_oDefaultFormat.Fill.bg); return oRes; }, getRgbOrNull : function() @@ -850,7 +845,7 @@ var g_oBorderProperties = { function Border(val) { if(null == val) - val = g_oDefaultBorderAbs; + val = g_oDefaultFormat.BorderAbs; this.Properties = g_oBorderProperties; this.l = val.l.clone(); this.t = val.t.clone(); @@ -873,16 +868,17 @@ Border.prototype = }, merge : function(border) { + var defaultBorder = g_oDefaultFormat.Border; var oRes = new Border(); - oRes.l = this._mergeProperty(this.l, border.l, g_oDefaultBorder.l).clone(); - oRes.t = this._mergeProperty(this.t, border.t, g_oDefaultBorder.t).clone(); - oRes.r = this._mergeProperty(this.r, border.r, g_oDefaultBorder.r).clone(); - oRes.b = this._mergeProperty(this.b, border.b, g_oDefaultBorder.b).clone(); - oRes.d = this._mergeProperty(this.d, border.d, g_oDefaultBorder.d).clone(); - oRes.ih = this._mergeProperty(this.ih, border.ih, g_oDefaultBorder.ih).clone(); - oRes.iv = this._mergeProperty(this.iv, border.iv, g_oDefaultBorder.iv).clone(); - oRes.dd = this._mergeProperty(this.dd, border.dd, g_oDefaultBorder.dd); - oRes.du = this._mergeProperty(this.du, border.du, g_oDefaultBorder.du); + oRes.l = this._mergeProperty(this.l, border.l, defaultBorder.l).clone(); + oRes.t = this._mergeProperty(this.t, border.t, defaultBorder.t).clone(); + oRes.r = this._mergeProperty(this.r, border.r, defaultBorder.r).clone(); + oRes.b = this._mergeProperty(this.b, border.b, defaultBorder.b).clone(); + oRes.d = this._mergeProperty(this.d, border.d, defaultBorder.d).clone(); + oRes.ih = this._mergeProperty(this.ih, border.ih, defaultBorder.ih).clone(); + oRes.iv = this._mergeProperty(this.iv, border.iv, defaultBorder.iv).clone(); + oRes.dd = this._mergeProperty(this.dd, border.dd, defaultBorder.dd); + oRes.du = this._mergeProperty(this.du, border.du, defaultBorder.du); return oRes; }, getDif : function(val) @@ -938,15 +934,16 @@ Border.prototype = }, clean : function() { - this.l = g_oDefaultBorder.l.clone(); - this.t = g_oDefaultBorder.t.clone(); - this.r = g_oDefaultBorder.r.clone(); - this.b = g_oDefaultBorder.b.clone(); - this.d = g_oDefaultBorder.d.clone(); - this.ih = g_oDefaultBorder.ih.clone(); - this.iv = g_oDefaultBorder.iv.clone(); - this.dd = g_oDefaultBorder.dd; - this.du = g_oDefaultBorder.du; + var defaultBorder = g_oDefaultFormat.Border; + this.l = defaultBorder.l.clone(); + this.t = defaultBorder.t.clone(); + this.r = defaultBorder.r.clone(); + this.b = defaultBorder.b.clone(); + this.d = defaultBorder.d.clone(); + this.ih = defaultBorder.ih.clone(); + this.iv = defaultBorder.iv.clone(); + this.dd = defaultBorder.dd; + this.du = defaultBorder.du; }, mergeInner : function(border){ if(border){ @@ -1016,7 +1013,7 @@ var g_oNumProperties = { function Num(val) { if(null == val) - val = g_oDefaultNumAbs; + val = g_oDefaultFormat.NumAbs; this.Properties = g_oNumProperties; this.f = val.f; } @@ -1025,7 +1022,7 @@ Num.prototype = merge : function(num) { var oRes = new Num(); - if(g_oDefaultNum.f != this.f) + if(g_oDefaultFormat.Num.f != this.f) oRes.f = this.f; else oRes.f = num.f; @@ -1214,7 +1211,7 @@ var g_oAlignProperties = { function Align(val) { if(null == val) - val = g_oDefaultAlignAbs; + val = g_oDefaultFormat.AlignAbs; this.Properties = g_oAlignProperties; this.hor = val.hor; this.indent = val.indent; @@ -1235,14 +1232,15 @@ Align.prototype = }, merge : function(border) { + var defaultAlign = g_oDefaultFormat.Align; var oRes = new Align(); - oRes.hor = this._mergeProperty(this.hor, border.hor, g_oDefaultAlign.hor); - oRes.indent = this._mergeProperty(this.indent, border.indent, g_oDefaultAlign.indent); - oRes.RelativeIndent = this._mergeProperty(this.RelativeIndent, border.RelativeIndent, g_oDefaultAlign.RelativeIndent); - oRes.shrink = this._mergeProperty(this.shrink, border.shrink, g_oDefaultAlign.shrink); - oRes.angle = this._mergeProperty(this.angle, border.angle, g_oDefaultAlign.angle); - oRes.ver = this._mergeProperty(this.ver, border.ver, g_oDefaultAlign.ver); - oRes.wrap = this._mergeProperty(this.wrap, border.wrap, g_oDefaultAlign.wrap); + oRes.hor = this._mergeProperty(this.hor, border.hor, defaultAlign.hor); + oRes.indent = this._mergeProperty(this.indent, border.indent, defaultAlign.indent); + oRes.RelativeIndent = this._mergeProperty(this.RelativeIndent, border.RelativeIndent, defaultAlign.RelativeIndent); + oRes.shrink = this._mergeProperty(this.shrink, border.shrink, defaultAlign.shrink); + oRes.angle = this._mergeProperty(this.angle, border.angle, defaultAlign.angle); + oRes.ver = this._mergeProperty(this.ver, border.ver, defaultAlign.ver); + oRes.wrap = this._mergeProperty(this.wrap, border.wrap, defaultAlign.wrap); return oRes; }, getDif : function(val) @@ -1456,7 +1454,7 @@ CCellStyles.prototype._prepareCellStyle = function (name) { this.CustomStyles[i].XfId = ++maxXfId; return this.CustomStyles[i].XfId; } - return g_oDefaultXfId; + return g_oDefaultFormat.XfId; }; /** @constructor */ function CCellStyle() { @@ -1494,28 +1492,28 @@ CCellStyle.prototype.getFill = function () { if (null != this.xfs && null != this.xfs.fill) return this.xfs.fill.bg; - return g_oDefaultFill.bg; + return g_oDefaultFormat.Fill.bg; }; CCellStyle.prototype.getFontColor = function () { if (null != this.xfs && null != this.xfs.font) return this.xfs.font.c; - return g_oDefaultFont.c; + return g_oDefaultFormat.Font.c; }; CCellStyle.prototype.getFont = function () { if (null != this.xfs && null != this.xfs.font) return this.xfs.font; - return g_oDefaultFont; + return g_oDefaultFormat.Font; }; CCellStyle.prototype.getBorder = function () { if (null != this.xfs && null != this.xfs.border) return this.xfs.border; - return g_oDefaultBorder; + return g_oDefaultFormat.Border; }; CCellStyle.prototype.getNumFormatStr = function () { if(null != this.xfs && null != this.xfs.num) return this.xfs.num.f; - return g_oDefaultNum.f; + return g_oDefaultFormat.Num.f; }; /** @constructor */ function StyleManager(){ @@ -1531,18 +1529,18 @@ StyleManager.prototype = init : function(oDefaultXfs) { if(null != oDefaultXfs.font) - g_oDefaultFont = oDefaultXfs.font.clone(); + g_oDefaultFormat.Font = oDefaultXfs.font.clone(); if(null != oDefaultXfs.fill) - g_oDefaultFill = oDefaultXfs.fill.clone(); + g_oDefaultFormat.Fill = oDefaultXfs.fill.clone(); if(null != oDefaultXfs.border) - g_oDefaultBorder = oDefaultXfs.border.clone(); + g_oDefaultFormat.Border = oDefaultXfs.border.clone(); if(null != oDefaultXfs.num) - g_oDefaultNum = oDefaultXfs.num.clone(); + g_oDefaultFormat.Num = oDefaultXfs.num.clone(); if(null != oDefaultXfs.align) - g_oDefaultAlign = oDefaultXfs.align.clone(); + g_oDefaultFormat.Align = oDefaultXfs.align.clone(); if (null !== oDefaultXfs.XfId) { this.oDefaultXfs.XfId = oDefaultXfs.XfId; - g_oDefaultXfId = oDefaultXfs.XfId; + g_oDefaultFormat.XfId = oDefaultXfs.XfId; } this.oDefaultXfs = oDefaultXfs; }, @@ -1569,14 +1567,14 @@ StyleManager.prototype = { var xfs = this._prepareSet(oItemWithXfs); if(null == xfs.font) - xfs.font = g_oDefaultFont.clone(); + xfs.font = g_oDefaultFormat.Font.clone(); return xfs; }, _prepareSetAlign : function(oItemWithXfs) { var xfs = this._prepareSet(oItemWithXfs); if(null == xfs.align) - xfs.align = g_oDefaultAlign.clone(); + xfs.align = g_oDefaultFormat.Align.clone(); return xfs; }, _prepareSetCellStyle : function (oItemWithXfs) { @@ -1590,11 +1588,11 @@ StyleManager.prototype = if(null != xfs && null != xfs.XfId) oRes.oldVal = xfs.XfId; else - oRes.oldVal = g_oDefaultXfId; + oRes.oldVal = g_oDefaultFormat.XfId; if(null == val) { if(null != xfs) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.XfId = g_oDefaultXfId; + xfs.XfId = g_oDefaultFormat.XfId; } } else { xfs = this._prepareSetCellStyle(oItemWithXfs); @@ -1609,7 +1607,7 @@ StyleManager.prototype = if(null != xfs && null != xfs.num) oRes.oldVal = xfs.num.f; else - oRes.oldVal = g_oDefaultNum.f; + oRes.oldVal = g_oDefaultFormat.Num.f; if(null == val) { if(null != xfs) { @@ -1621,7 +1619,7 @@ StyleManager.prototype = { xfs = this._prepareSet(oItemWithXfs); if(null == xfs.num) - xfs.num = g_oDefaultNum.clone(); + xfs.num = g_oDefaultFormat.Num.clone(); xfs.num.f = val; } return oRes; @@ -1655,14 +1653,14 @@ StyleManager.prototype = if(null != xfs && null != xfs.font) oRes.oldVal = xfs.font.fn; else - oRes.oldVal = g_oDefaultFont.fn; + oRes.oldVal = g_oDefaultFormat.Font.fn; //todo undo для scheme if(null == val) { if(null != xfs && null != xfs.font) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.font.fn = g_oDefaultFont.fn; + xfs.font.fn = g_oDefaultFormat.Font.fn; xfs.font.scheme = Asc.EFontScheme.fontschemeNone; } } @@ -1681,12 +1679,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.font) oRes.oldVal = xfs.font.fs; else - oRes.oldVal = g_oDefaultFont.fs; + oRes.oldVal = g_oDefaultFormat.Font.fs; if(null == val) { if(null != xfs && null != xfs.font) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.font.fs = g_oDefaultFont.fs; + xfs.font.fs = g_oDefaultFormat.Font.fs; } } else @@ -1703,12 +1701,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.font) oRes.oldVal = xfs.font.c; else - oRes.oldVal = g_oDefaultFont.c; + oRes.oldVal = g_oDefaultFormat.Font.c; if(null == val) { if(null != xfs && null != xfs.font) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.font.c = g_oDefaultFont.c; + xfs.font.c = g_oDefaultFormat.Font.c; } } else @@ -1725,12 +1723,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.font) oRes.oldVal = xfs.font.b; else - oRes.oldVal = g_oDefaultFont.b; + oRes.oldVal = g_oDefaultFormat.Font.b; if(null == val) { if(null != xfs && null != xfs.font) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.font.b = g_oDefaultFont.b; + xfs.font.b = g_oDefaultFormat.Font.b; } } else @@ -1747,12 +1745,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.font) oRes.oldVal = xfs.font.i; else - oRes.oldVal = g_oDefaultFont.i; + oRes.oldVal = g_oDefaultFormat.Font.i; if(null == val) { if(null != xfs && null != xfs.font) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.font.i = g_oDefaultFont.i; + xfs.font.i = g_oDefaultFormat.Font.i; } } else @@ -1769,12 +1767,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.font) oRes.oldVal = xfs.font.u; else - oRes.oldVal = g_oDefaultFont.u; + oRes.oldVal = g_oDefaultFormat.Font.u; if(null == val) { if(null != xfs && null != xfs.font) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.font.u = g_oDefaultFont.u; + xfs.font.u = g_oDefaultFormat.Font.u; } } else @@ -1791,12 +1789,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.font) oRes.oldVal = xfs.font.s; else - oRes.oldVal = g_oDefaultFont.s; + oRes.oldVal = g_oDefaultFormat.Font.s; if(null == val) { if(null != xfs && null != xfs.font) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.font.s = g_oDefaultFont.s; + xfs.font.s = g_oDefaultFormat.Font.s; } } else @@ -1813,12 +1811,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.font) oRes.oldVal = xfs.font.va; else - oRes.oldVal = g_oDefaultFont.va; + oRes.oldVal = g_oDefaultFormat.Font.va; if(null == val) { if(null != xfs && null != xfs.font) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.font.va = g_oDefaultFont.va; + xfs.font.va = g_oDefaultFormat.Font.va; } } else @@ -1835,12 +1833,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.align) oRes.oldVal = xfs.align.ver; else - oRes.oldVal = g_oDefaultAlign.ver; + oRes.oldVal = g_oDefaultFormat.Align.ver; if(null == val) { if(null != xfs && null != xfs.align) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.align.ver = g_oDefaultAlign.ver; + xfs.align.ver = g_oDefaultFormat.Align.ver; } } else @@ -1857,12 +1855,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.align) oRes.oldVal = xfs.align.hor; else - oRes.oldVal = g_oDefaultAlign.hor; + oRes.oldVal = g_oDefaultFormat.Align.hor; if(null == val) { if(null != xfs && null != xfs.align) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.align.hor = g_oDefaultAlign.hor; + xfs.align.hor = g_oDefaultFormat.Align.hor; } } else @@ -1879,19 +1877,19 @@ StyleManager.prototype = if(null != xfs && null != xfs.fill) oRes.oldVal = xfs.fill.bg; else - oRes.oldVal = g_oDefaultFill.bg; + oRes.oldVal = g_oDefaultFormat.Fill.bg; if(null == val) { if(null != xfs && null != xfs.fill) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.fill.bg = g_oDefaultFill.bg; + xfs.fill.bg = g_oDefaultFormat.Fill.bg; } } else { xfs = this._prepareSet(oItemWithXfs); if(null == xfs.fill) - xfs.fill = g_oDefaultFill.clone(); + xfs.fill = g_oDefaultFormat.Fill.clone(); xfs.fill.bg = val; } return oRes; @@ -1903,7 +1901,7 @@ StyleManager.prototype = if(null != xfs && null != xfs.border) oRes.oldVal = xfs.border; else - oRes.oldVal = g_oDefaultBorder; + oRes.oldVal = g_oDefaultFormat.Border; if(null == val) { if(null != xfs && null != xfs.border) { @@ -1925,12 +1923,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.align) oRes.oldVal = xfs.align.shrink; else - oRes.oldVal = g_oDefaultAlign.shrink; + oRes.oldVal = g_oDefaultFormat.Align.shrink; if(null == val) { if(null != xfs && null != xfs.align) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.align.shrink = g_oDefaultAlign.shrink; + xfs.align.shrink = g_oDefaultFormat.Align.shrink; } } else @@ -1947,12 +1945,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.align) oRes.oldVal = xfs.align.wrap; else - oRes.oldVal = g_oDefaultAlign.wrap; + oRes.oldVal = g_oDefaultFormat.Align.wrap; if(null == val) { if(null != xfs && null != xfs.align) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.align.wrap = g_oDefaultAlign.wrap; + xfs.align.wrap = g_oDefaultFormat.Align.wrap; } } else @@ -1990,12 +1988,12 @@ StyleManager.prototype = if(null != xfs && null != xfs.align) oRes.oldVal = angleFormatToInterface2(xfs.align.angle); else - oRes.oldVal = angleFormatToInterface2(g_oDefaultAlign.angle); + oRes.oldVal = angleFormatToInterface2(g_oDefaultFormat.Align.angle); if(null == val) { if(null != xfs && null != xfs.align) { xfs = this._prepareSetReference(oItemWithXfs); - xfs.align.angle = g_oDefaultAlign.angle; + xfs.align.angle = g_oDefaultFormat.Align.angle; } } else @@ -2929,7 +2927,7 @@ CCellValue.prototype = if(null != xfs && null != xfs.num) oNumFormat = oNumFormatCache.get(xfs.num.f); else - oNumFormat = oNumFormatCache.get(g_oDefaultNum.f); + oNumFormat = oNumFormatCache.get(g_oDefaultFormat.Num.f); if(false == oNumFormat.isGeneralFormat()) { var oAdditionalResult = {}; @@ -3065,7 +3063,7 @@ CCellValue.prototype = if(null != xfs && null != xfs.num) oNumFormat = oNumFormatCache.get(xfs.num.f); else - oNumFormat = oNumFormatCache.get(g_oDefaultNum.f); + oNumFormat = oNumFormatCache.get(g_oDefaultFormat.Num.f); if(CellValueType.String != this.type && null != oNumFormat && null != this.number) { var nValue = this.number; @@ -3153,7 +3151,7 @@ CCellValue.prototype = if(null != xfs && null != xfs.font) cellfont = xfs.font; else - cellfont = g_oDefaultFont; + cellfont = g_oDefaultFormat.Font; if(null != sText){ var oNewItem = new Fragment(); oNewItem.text = sText; @@ -3249,7 +3247,7 @@ CCellValue.prototype = if(null != xfs && null != xfs.num) oNumFormat = oNumFormatCache.get(xfs.num.f); else - oNumFormat = oNumFormatCache.get(g_oDefaultNum.f); + oNumFormat = oNumFormatCache.get(g_oDefaultFormat.Num.f); if(oNumFormat.isTextFormat()) { this.type = CellValueType.String; @@ -3341,7 +3339,7 @@ CCellValue.prototype = var item = aVal[i]; var oNewElem = new CCellValueMultiText(); oNewElem.text = item.text; - oNewElem.format = g_oDefaultFont.clone(); + oNewElem.format = g_oDefaultFormat.Font.clone(); if(null != item.format) oNewElem.format.set(item.format); this.multiText.push(oNewElem); @@ -3413,7 +3411,7 @@ CCellValue.prototype = if(bSetCellFont) { - if (oIntersectFont.isEqual(g_oDefaultFont)) + if (oIntersectFont.isEqual(g_oDefaultFormat.Font)) cell.setFont(null, false); else cell.setFont(oIntersectFont, false); @@ -4690,9 +4688,9 @@ TablePart.prototype.addTableLastColumn = function(activeRange, autoFilters, isAd this.TableColumns = newTableColumns; }; -TablePart.prototype.getType = function(F) +TablePart.prototype.isAutoFilter = function() { - return g_nFiltersType.tablePart; + return false; }; TablePart.prototype.getTableRangeForFormula = function(objectParam) @@ -4928,9 +4926,9 @@ AutoFilter.prototype.isApplySortConditions = function() { return res; }; -AutoFilter.prototype.getType = function() +AutoFilter.prototype.isAutoFilter = function() { - return g_nFiltersType.autoFilter; + return true; }; AutoFilter.prototype.cleanFilters = function() { @@ -5770,7 +5768,58 @@ AutoFilterDateElem.prototype.convertDateGroupItemToRange = function(oDateGroupIt this.dateTimeGrouping = oDateGroupItem.DateTimeGrouping; }; -var prot; + //----------------------------------------------------------export---------------------------------------------------- + var prot; + window['Asc'] = window['Asc'] || {}; + window['AscCommonExcel'] = window['AscCommonExcel'] || {}; + window['AscCommonExcel'].g_oColorManager = g_oColorManager; + window['AscCommonExcel'].g_oDefaultFormat = g_oDefaultFormat; + window['AscCommonExcel'].g_nColorTextDefault = g_nColorTextDefault; + window['AscCommonExcel'].g_nColorHyperlink = g_nColorHyperlink; + window['AscCommonExcel'].g_oThemeColorsDefaultModsSpreadsheet = g_oThemeColorsDefaultModsSpreadsheet; + window['AscCommonExcel'].map_themeExcel_to_themePresentation = map_themeExcel_to_themePresentation; + window['AscCommonExcel'].shiftGetBBox = shiftGetBBox; + window['AscCommonExcel'].RgbColor = RgbColor; + window['AscCommonExcel'].ThemeColor = ThemeColor; + window['AscCommonExcel'].CorrectAscColor = CorrectAscColor; + window['AscCommonExcel'].Fragment = Fragment; + window['AscCommonExcel'].Font = Font; + window['AscCommonExcel'].Fill = Fill; + window['AscCommonExcel'].BorderProp = BorderProp; + window['AscCommonExcel'].Border = Border; + window['AscCommonExcel'].Num = Num; + window['AscCommonExcel'].CellXfs = CellXfs; + window['AscCommonExcel'].Align = Align; + window['AscCommonExcel'].CCellStyles = CCellStyles; + window['AscCommonExcel'].CCellStyle = CCellStyle; + window['AscCommonExcel'].StyleManager = StyleManager; + window['AscCommonExcel'].Hyperlink = Hyperlink; + window['AscCommonExcel'].SheetFormatPr = SheetFormatPr; + window['AscCommonExcel'].Col = Col; + window['AscCommonExcel'].g_nRowFlag_empty = g_nRowFlag_empty; + window['AscCommonExcel'].g_nRowFlag_hd = g_nRowFlag_hd; + window['AscCommonExcel'].g_nRowFlag_CustomHeight = g_nRowFlag_CustomHeight; + window['AscCommonExcel'].Row = Row; + window['AscCommonExcel'].CCellValueMultiText = CCellValueMultiText; + window['AscCommonExcel'].CCellValue = CCellValue; + window['AscCommonExcel'].RangeDataManagerElem = RangeDataManagerElem; + window['AscCommonExcel'].RangeDataManager = RangeDataManager; + window['AscCommonExcel'].CellArea = CellArea; + window['AscCommonExcel'].sparklineGroups = sparklineGroups; + window['AscCommonExcel'].sparklineGroup = sparklineGroup; + window['AscCommonExcel'].sparkline = sparkline; + window['AscCommonExcel'].TablePart = TablePart; + window['AscCommonExcel'].AutoFilter = AutoFilter; + window['AscCommonExcel'].SortState = SortState; + window['AscCommonExcel'].TableColumn = TableColumn; + window['AscCommonExcel'].TableStyleInfo = TableStyleInfo; + window['AscCommonExcel'].FilterColumn = FilterColumn; + window['AscCommonExcel'].Filters = Filters; + window['AscCommonExcel'].Filter = Filter; + window['AscCommonExcel'].DateGroupItem = DateGroupItem; + window['AscCommonExcel'].SortCondition = SortCondition; + window['AscCommonExcel'].AutoFilterDateElem = AutoFilterDateElem; + window["Asc"]["CustomFilters"] = window["Asc"].CustomFilters = CustomFilters; prot = CustomFilters.prototype; prot["asc_getAnd"] = prot.asc_getAnd; @@ -5785,13 +5834,6 @@ prot["asc_getVal"] = prot.asc_getVal; prot["asc_setOperator"] = prot.asc_setOperator; prot["asc_setVal"] = prot.asc_setVal; -window["Asc"]["CustomFilter"] = window["Asc"].CustomFilter = CustomFilter; -prot = CustomFilter.prototype; -prot["asc_getOperator"] = prot.asc_getOperator; -prot["asc_getVal"] = prot.asc_getVal; -prot["asc_setOperator"] = prot.asc_setOperator; -prot["asc_setVal"] = prot.asc_setVal; - window["Asc"]["DynamicFilter"] = window["Asc"].DynamicFilter = DynamicFilter; prot = DynamicFilter.prototype; prot["asc_getType"] = prot.asc_getType; @@ -5817,4 +5859,5 @@ prot["asc_getVal"] = prot.asc_getVal; prot["asc_setFilterVal"] = prot.asc_setFilterVal; prot["asc_setPercent"] = prot.asc_setPercent; prot["asc_setTop"] = prot.asc_setTop; -prot["asc_setVal"] = prot.asc_setVal; \ No newline at end of file +prot["asc_setVal"] = prot.asc_setVal; +})(window); diff --git a/cell/model/autofilters.js b/cell/model/autofilters.js index df65dfc12f..d4fcab134e 100644 --- a/cell/model/autofilters.js +++ b/cell/model/autofilters.js @@ -305,7 +305,7 @@ if(tablePartsContainsRange) { cloneFilter = tablePartsContainsRange.clone(null); - tablePartsContainsRange.AutoFilter = new AutoFilter(); + tablePartsContainsRange.AutoFilter = new AscCommonExcel.AutoFilter(); tablePartsContainsRange.AutoFilter.Ref = tablePartsContainsRange.Ref.clone(); //history @@ -422,7 +422,7 @@ cloneFilter = isTablePartsContainsRange.clone(null); if(!isTablePartsContainsRange.TableStyleInfo) - isTablePartsContainsRange.TableStyleInfo = new TableStyleInfo(); + isTablePartsContainsRange.TableStyleInfo = new AscCommonExcel.TableStyleInfo(); isTablePartsContainsRange.TableStyleInfo.Name = styleName; t._setColorStyleTable(isTablePartsContainsRange.Ref, isTablePartsContainsRange); @@ -483,7 +483,7 @@ if(filterObj.filter.TableStyleInfo !== undefined) autoFilter = filterObj.filter.AutoFilter; if(!autoFilter) - autoFilter = new AutoFilter(); + autoFilter = new AscCommonExcel.AutoFilter(); var newFilterColumn; if(filterObj.index !== null) { @@ -506,7 +506,7 @@ //автоматическое расширение диапазона а/ф - if(autoFiltersObject.automaticRowCount && filterObj.filter && filterObj.filter.Ref && filterObj.filter.getType() === g_nFiltersType.autoFilter) + if(autoFiltersObject.automaticRowCount && filterObj.filter && filterObj.filter.Ref && filterObj.filter.isAutoFilter()) { var currentDiff = filterObj.filter.Ref.r2 - filterObj.filter.Ref.r1; var newDiff = autoFiltersObject.automaticRowCount - filterObj.filter.Ref.r1; @@ -821,7 +821,7 @@ } else if(type === AscCH.historyitem_AutoFilter_Sort && cloneData.oldFilter)//сортировка { - if(worksheet.AutoFilter && cloneData.oldFilter.getType() === g_nFiltersType.autoFilter) + if(worksheet.AutoFilter && cloneData.oldFilter.isAutoFilter()) worksheet.AutoFilter = cloneData.oldFilter.clone(null); else if(worksheet.TableParts) { @@ -852,7 +852,7 @@ } } } - else if(cloneData.FilterColumns || cloneData.AutoFilter || cloneData.TableColumns || (cloneData.Ref && (cloneData instanceof AutoFilter || cloneData instanceof TablePart)))//add + else if(cloneData.FilterColumns || cloneData.AutoFilter || cloneData.TableColumns || (cloneData.Ref && (cloneData instanceof AscCommonExcel.AutoFilter || cloneData instanceof AscCommonExcel.TablePart)))//add { if(cloneData.Ref) { @@ -1499,10 +1499,10 @@ curFilter.SortState = new SortState(); curFilter.SortState.Ref = new Asc.Range(startCol, curFilter.Ref.r1, startCol, maxFilterRow); curFilter.SortState.SortConditions = []; - curFilter.SortState.SortConditions[0] = new SortCondition(); + curFilter.SortState.SortConditions[0] = new AscCommonExcel.SortCondition(); } if(!curFilter.SortState.SortConditions[0]) - curFilter.SortState.SortConditions[0] = new SortCondition(); + curFilter.SortState.SortConditions[0] = new AscCommonExcel.SortCondition(); var cellIdRange = new Asc.Range(startCol, filterRef.r1, startCol, filterRef.r1); @@ -1590,7 +1590,7 @@ maxFilterRow = filterRef.r2; - if(curFilter.getType() === g_nFiltersType.autoFilter && curFilter.isApplyAutoFilter() === false)//нужно подхватить нижние ячейки в случае, если это не применен а/ф + if(curFilter.isAutoFilter() && curFilter.isApplyAutoFilter() === false)//нужно подхватить нижние ячейки в случае, если это не применен а/ф { var automaticRange = this._getAdjacentCellsAF(curFilter.Ref, true); var automaticRowCount = automaticRange.r2; @@ -1701,21 +1701,21 @@ return false; }, - - unmergeTablesAfterMove: function(arnTo) - { - var worksheet = this.worksheet; - - var intersectionRangeWithTableParts = this._intersectionRangeWithTableParts(arnTo); - if(intersectionRangeWithTableParts && intersectionRangeWithTableParts.length) - { - for(var i = 0; i < intersectionRangeWithTableParts.length; i++) - { - var tablePart = intersectionRangeWithTableParts[i]; - worksheet.mergeManager.remove(tablePart.Ref.clone()); - } - } - }, + + unmergeTablesAfterMove: function(arnTo) + { + var worksheet = this.worksheet; + + var intersectionRangeWithTableParts = this._intersectionRangeWithTableParts(arnTo); + if(intersectionRangeWithTableParts && intersectionRangeWithTableParts.length) + { + for(var i = 0; i < intersectionRangeWithTableParts.length; i++) + { + var tablePart = intersectionRangeWithTableParts[i]; + worksheet.mergeManager.remove(tablePart.Ref.clone()); + } + } + }, _setStyleTablePartsAfterOpenRows: function(ref) { @@ -3062,7 +3062,7 @@ { if(!worksheet.AutoFilter) { - newFilter = new AutoFilter(); + newFilter = new AscCommonExcel.AutoFilter(); //ref = Asc.g_oRangeCache.getAscRange(val[0].id + ':' + val[val.length - 1].idNext).clone(); newFilter.Ref = ref; worksheet.AutoFilter = newFilter; @@ -3099,7 +3099,7 @@ if(!bWithoutFilter) { - newFilter.AutoFilter = new AutoFilter(); + newFilter.AutoFilter = new AscCommonExcel.AutoFilter(); newFilter.AutoFilter.Ref = ref; } @@ -3112,7 +3112,7 @@ newFilter.DisplayName = worksheet.workbook.dependencyFormulas.getNextTableName(worksheet, ref); - newFilter.TableStyleInfo = new TableStyleInfo(); + newFilter.TableStyleInfo = new AscCommonExcel.TableStyleInfo(); newFilter.TableStyleInfo.Name = style; if(pasteTablePartObj && pasteTablePartObj.ShowColumnStripes !== null && pasteTablePartObj.ShowColumnStripes !== undefined) @@ -3386,7 +3386,7 @@ var maxFilterRow = ref.r2; var automaticRowCount = null; - if(filter.getType() === g_nFiltersType.autoFilter && filter.isApplyAutoFilter() === false)//нужно подхватить нижние ячейки в случае, если это не применен а/ф + if(filter.isAutoFilter() && filter.isApplyAutoFilter() === false)//нужно подхватить нижние ячейки в случае, если это не применен а/ф { var automaticRange = this._getAdjacentCellsAF(filter.Ref, true); automaticRowCount = automaticRange.r2; @@ -3491,7 +3491,7 @@ return null; var res = colId; - if(filter.getType() !== g_nFiltersType.autoFilter) + if(!filter.isAutoFilter()) return res; //если находимся в мерженной ячейке, то возвращаем сдвинутый colId @@ -3563,7 +3563,7 @@ _openHiddenRows: function(filter) { var worksheet = this.worksheet; - var autoFilter = filter.getType() === g_nFiltersType.autoFilter ? filter : filter.AutoFilter; + var autoFilter = filter.isAutoFilter() ? filter : filter.AutoFilter; var isApplyFilter = autoFilter && autoFilter.FilterColumns && autoFilter.FilterColumns.length ? true : false; if(filter && filter.Ref && isApplyFilter) @@ -3597,7 +3597,7 @@ _openAllHiddenRowsByFilter: function(filter) { - var autoFilter = filter && filter.getType() === g_nFiltersType.tablePart ? filter.AutoFilter : filter; + var autoFilter = filter && !filter.isAutoFilter() ? filter.AutoFilter : filter; if(autoFilter && autoFilter.FilterColumns) { var filterColumns = autoFilter.FilterColumns; @@ -3712,7 +3712,7 @@ } else { - if(allF[i].getType() === g_nFiltersType.autoFilter) + if(allF[i].isAutoFilter()) { if(isAll === false && activeCells && range && !activeCells.containsRange(range) && !(range.containsRange(activeCells) && activeCells.c1 == activeCells.c2 && activeCells.r1 == activeCells.r2))//если задеваем часть примененного фильтра и добавляем форматированную таблицу { @@ -3744,7 +3744,7 @@ if(this._crossRange(activeCells,range)) { //если мы находимся в общем фильтре и нажали на кнопку общего фильтра - тогда нет ошибки - if(!(allF[i].getType() === g_nFiltersType.autoFilter && allF[i].Ref.r1 === activeCells.r1)) + if(!(allF[i].isAutoFilter() && allF[i].Ref.r1 === activeCells.r1)) { if(!(worksheet.AutoFilter && i == 0 && isAll == true)/* && allF[i].AutoFilter !== undefined*/) num = 'error'; @@ -3822,7 +3822,7 @@ s = -1; } } - newTableColumn = new TableColumn(); + newTableColumn = new AscCommonExcel.TableColumn(); newTableColumn.Name = valNew; tableColumns[col1 - range.c1] = newTableColumn; diff --git a/cell/model/clipboard.js b/cell/model/clipboard.js index 820f403099..79a60d7e51 100644 --- a/cell/model/clipboard.js +++ b/cell/model/clipboard.js @@ -1476,7 +1476,7 @@ if (jqSpanObject.css('vertical-align') == 'baseline') oNewItem.format.va = ''; - oNewItem.format.c = new RgbColor(this._getBinaryColor(jqSpanObject.css('color'))); + oNewItem.format.c = new AscCommonExcel.RgbColor(this._getBinaryColor(jqSpanObject.css('color'))); if (oNewItem.format.c == '') oNewItem.format.c = null; @@ -2866,7 +2866,7 @@ text = elem.textContent.replace('\t',''); if(elem.nodeName.toLowerCase() == 'br') text = '\n'; - var colorText = new RgbColor(t._getBinaryColor(style.getPropertyValue("color"))); + var colorText = new AscCommonExcel.RgbColor(t._getBinaryColor(style.getPropertyValue("color"))); if(isText || (isText == '' && typeof isText == 'string')) colorText = null; res.push({ @@ -3479,14 +3479,14 @@ var defaultStyle = "solid"; var borderStyleName; - var formatBorders = oldBorders ? oldBorders : new Border(); + var formatBorders = oldBorders ? oldBorders : new AscCommonExcel.Border(); //top border for cell if(top == cellTable.top && !formatBorders.t.s && borders.Top.Value !== 0/*border_None*/) { borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Top.Size,3,1)); if (null !== borderStyleName) { formatBorders.t.setStyle(borderStyleName); - formatBorders.t.c = new RgbColor(this.clipboard._getBinaryColor("rgb(" + borders.Top.Color.r + "," + borders.Top.Color.g + "," + borders.Top.Color.b + ")")); + formatBorders.t.c = new AscCommonExcel.RgbColor(this.clipboard._getBinaryColor("rgb(" + borders.Top.Color.r + "," + borders.Top.Color.g + "," + borders.Top.Color.b + ")")); } } //left border for cell @@ -3495,7 +3495,7 @@ borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Left.Size,3,1)); if (null !== borderStyleName) { formatBorders.l.setStyle(borderStyleName); - formatBorders.l.c = new RgbColor(this.clipboard._getBinaryColor("rgb(" + borders.Left.Color.r + "," + borders.Left.Color.g + "," + borders.Left.Color.b + ")")); + formatBorders.l.c = new AscCommonExcel.RgbColor(this.clipboard._getBinaryColor("rgb(" + borders.Left.Color.r + "," + borders.Left.Color.g + "," + borders.Left.Color.b + ")")); } } //bottom border for cell @@ -3504,7 +3504,7 @@ borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Bottom.Size,3,1)); if (null !== borderStyleName) { formatBorders.b.setStyle(borderStyleName); - formatBorders.b.c = new RgbColor(this.clipboard._getBinaryColor("rgb(" + borders.Bottom.Color.r + "," + borders.Bottom.Color.g + "," + borders.Bottom.Color.b + ")")); + formatBorders.b.c = new AscCommonExcel.RgbColor(this.clipboard._getBinaryColor("rgb(" + borders.Bottom.Color.r + "," + borders.Bottom.Color.g + "," + borders.Bottom.Color.b + ")")); } } //right border for cell @@ -3513,7 +3513,7 @@ borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Right.Size,3,1)); if (null !== borderStyleName) { formatBorders.r.setStyle(borderStyleName); - formatBorders.r.c = new RgbColor(this.clipboard._getBinaryColor("rgb(" + borders.Right.Color.r + "," + borders.Right.Color.g + "," + borders.Right.Color.b + ")")); + formatBorders.r.c = new AscCommonExcel.RgbColor(this.clipboard._getBinaryColor("rgb(" + borders.Right.Color.r + "," + borders.Right.Color.g + "," + borders.Right.Color.b + ")")); } } @@ -3723,7 +3723,7 @@ if(compiledPrCell && compiledPrCell.Shd.Value !== 1/*shd_Nil*/) { var color = compiledPrCell.Shd.Color; - backgroundColor = new RgbColor(this.clipboard._getBinaryColor("rgb(" + color.r + "," + color.g + "," + color.b + ")")); + backgroundColor = new AscCommonExcel.RgbColor(this.clipboard._getBinaryColor("rgb(" + color.r + "," + color.g + "," + color.b + ")")); }; }; @@ -4145,10 +4145,10 @@ else if(paraPr.TextPr.VertAlign == 2) paragraphVertAlign = "subscript"; - var colorParagraph = new RgbColor(this.clipboard._getBinaryColor("rgb(" + paraPr.TextPr.Color.r + "," + paraPr.TextPr.Color.g + "," + paraPr.TextPr.Color.b + ")")); + var colorParagraph = new AscCommonExcel.RgbColor(this.clipboard._getBinaryColor("rgb(" + paraPr.TextPr.Color.r + "," + paraPr.TextPr.Color.g + "," + paraPr.TextPr.Color.b + ")")); if(cTextPr.Color) - colorText = new RgbColor(this.clipboard._getBinaryColor("rgb(" + cTextPr.Color.r + "," + cTextPr.Color.g + "," + cTextPr.Color.b + ")")); + colorText = new AscCommonExcel.RgbColor(this.clipboard._getBinaryColor("rgb(" + cTextPr.Color.r + "," + cTextPr.Color.g + "," + cTextPr.Color.b + ")")); else colorText = null; diff --git a/cell/native/DrawingContext.js b/cell/native/DrawingContext.js index 74ee1bf221..87f60531ae 100644 --- a/cell/native/DrawingContext.js +++ b/cell/native/DrawingContext.js @@ -20,7 +20,7 @@ var g = color.getG(); var b = color.getB(); var bTheme = false; - if(color instanceof ThemeColor && null != color.theme) + if(color instanceof AscCommonExcel.ThemeColor && null != color.theme) { var array_colors_types = [6, 15, 7, 16, 0, 1, 2, 3, 4, 5]; var themePresentation = array_colors_types[color.theme]; @@ -28,8 +28,8 @@ if(null != color.tint) tintExcel = color.tint; var tintPresentation = 0; - var basecolor = g_oColorManager.getThemeColor(color.theme); - var oThemeColorTint = g_oThemeColorsDefaultModsSpreadsheet[AscCommon.GetDefaultColorModsIndex(basecolor.getR(), basecolor.getG(), basecolor.getB())]; + var basecolor = AscCommonExcel.g_oColorManager.getThemeColor(color.theme); + var oThemeColorTint = AscCommonExcel.g_oThemeColorsDefaultModsSpreadsheet[AscCommon.GetDefaultColorModsIndex(basecolor.getR(), basecolor.getG(), basecolor.getB())]; if(null != oThemeColorTint) { for(var i = 0 , length = oThemeColorTint.length; i < length; ++i) @@ -710,7 +710,7 @@ }; /** - * @param {RgbColor || ThemeColor || AscCommon.CColor} val + * @param {AscCommonExcel.RgbColor || AscCommonExcel.ThemeColor || AscCommon.CColor} val * @returns {DrawingContext} */ DrawingContext.prototype.setFillStyle = function (val) { @@ -730,7 +730,7 @@ }; /** - * @param {RgbColor || ThemeColor || AscCommon.CColor} val + * @param {AscCommonExcel.RgbColor || AscCommonExcel.ThemeColor || AscCommon.CColor} val * @returns {DrawingContext} */ DrawingContext.prototype.setStrokeStyle = function (val) { diff --git a/cell/utils/utils.js b/cell/utils/utils.js index 1e66d62232..81d96c8332 100644 --- a/cell/utils/utils.js +++ b/cell/utils/utils.js @@ -979,7 +979,7 @@ } // Класс Hyperlink из модели - this.hyperlinkModel = null != obj ? obj : new Hyperlink(); + this.hyperlinkModel = null != obj ? obj : new AscCommonExcel.Hyperlink(); // Используется только для выдачи наружу и выставлении обратно this.text = null; diff --git a/cell/view/CellEditorView.js b/cell/view/CellEditorView.js index 32debb4217..3f35218ba2 100644 --- a/cell/view/CellEditorView.js +++ b/cell/view/CellEditorView.js @@ -24,6 +24,7 @@ var cElementType = AscCommonExcel.cElementType; var c_oAscCellEditorSelectState = AscCommonExcel.c_oAscCellEditorSelectState; var c_oAscCellEditorState = asc.c_oAscCellEditorState; + var Fragment = AscCommonExcel.Fragment; var asc_calcnpt = asc.calcNearestPt; var asc_getcvt = asc.getCvtRatio; diff --git a/cell/view/WorksheetView.js b/cell/view/WorksheetView.js index 96c1f699c9..4a5aeab946 100644 --- a/cell/view/WorksheetView.js +++ b/cell/view/WorksheetView.js @@ -1431,13 +1431,13 @@ h = -1; // Будет использоваться дефолтная высота строки isCustomHeight = false; } - else if ( 0 != (g_nRowFlag_hd & row.flags) ) { + else if ( 0 != (AscCommonExcel.g_nRowFlag_hd & row.flags) ) { hR = h = 0; // Скрытая строка, высоту выставляем 0 isCustomHeight = true; hiddenH += row.h > 0 ? row.h - this.height_1px : defaultH; } else { - isCustomHeight = 0 != (g_nRowFlag_CustomHeight & row.flags); + isCustomHeight = 0 != (AscCommonExcel.g_nRowFlag_CustomHeight & row.flags); // Берем высоту из модели, если она custom(баг 15618), либо дефолтную if ( row.h > 0 && isCustomHeight ) { hR = row.h; @@ -2978,7 +2978,7 @@ var bc = null, bw = -1, isNotFirst = false; // cached border color function drawBorder( type, border, x1, y1, x2, y2 ) { - var isStroke = false, isNewColor = !g_oColorManager.isEqual( bc, border.c ), isNewWidth = bw !== border.w; + var isStroke = false, isNewColor = !AscCommonExcel.g_oColorManager.isEqual( bc, border.c ), isNewWidth = bw !== border.w; if ( isNotFirst && (isNewColor || isNewWidth) ) { ctx.stroke(); isStroke = true; @@ -6367,7 +6367,7 @@ } if ( drawingInfo.hyperlink instanceof ParaHyperlink ) { - oHyperlink = new Hyperlink(); + oHyperlink = new AscCommonExcel.Hyperlink(); oHyperlink.Tooltip = drawingInfo.hyperlink.ToolTip; var spl = drawingInfo.hyperlink.Value.split( "!" ); if ( spl.length === 2 ) { @@ -7509,7 +7509,7 @@ var shapeHyperlink = this.objectRender.controller.getHyperlinkInfo(); if ( shapeHyperlink && (shapeHyperlink instanceof ParaHyperlink) ) { - var hyperlink = new Hyperlink(); + var hyperlink = new AscCommonExcel.Hyperlink(); hyperlink.Tooltip = shapeHyperlink.ToolTip; var spl = shapeHyperlink.Value.split( "!" ); @@ -8922,7 +8922,7 @@ } if ( b.color !== null && b.color !== undefined ) { if ( b.color instanceof Asc.asc_CColor ) { - border.c = CorrectAscColor( b.color ); + border.c = AscCommonExcel.CorrectAscColor( b.color ); } } } @@ -8997,7 +8997,7 @@ range.setBorder( null ); break; } - res = new Border(); + res = new AscCommonExcel.Border(); // Diagonal res.d = makeBorder( val[c_oAscBorderOptions.DiagD] || val[c_oAscBorderOptions.DiagU] ); res.dd = val[c_oAscBorderOptions.DiagD] ? true : false; @@ -9595,7 +9595,7 @@ } var link = values[r][c][0].hyperLink; if ( link ) { - var newHyperlink = new Hyperlink(); + var newHyperlink = new AscCommonExcel.Hyperlink(); if ( values[r][c][0].hyperLink.search( '#' ) === 0 ) { newHyperlink.setLocation( link.replace( '#', '' ) ); } @@ -11034,7 +11034,7 @@ v = c.getValueForEdit2().slice( 0, 1 ); // Создаем новый массив, т.к. getValueForEdit2 возвращает ссылку newValue = []; - newValue[0] = new Fragment( {text: cellValue, format: v[0].format.clone()} ); + newValue[0] = new AscCommonExcel.Fragment( {text: cellValue, format: v[0].format.clone()} ); t._saveCellValueAfterEdit( oCellEdit, c, newValue, /*flags*/undefined, /*skipNLCheck*/false, /*isNotHistory*/true, /*lockDraw*/true ); } @@ -11519,7 +11519,7 @@ v = c.getValueForEdit2().slice( 0, 1 ); // Создаем новый массив, т.к. getValueForEdit2 возвращает ссылку copyValue = []; - copyValue[0] = new Fragment( {text: text, format: v[0].format.clone()} ); + copyValue[0] = new AscCommonExcel.Fragment( {text: text, format: v[0].format.clone()} ); var bSuccess = t.openCellEditor( editor, 0, 0, /*isCoord*/false, /*fragments*/undefined, /*cursorPos*/undefined, isFocus, /*isClearCell*/true, /*isHideCursor*/false, /*isQuickInput*/false, activeRange ); if ( bSuccess ) { @@ -12432,8 +12432,7 @@ var _isShowButtonInFilter = function(col, filter) { var result = true; - var typeFilter = filter ? filter.getType() : null; - var autoFilter = typeFilter !== null && typeFilter === g_nFiltersType.autoFilter ? filter : filter.AutoFilter; + var autoFilter = filter.isAutoFilter() ? filter : filter.AutoFilter; if(filter.HeaderRowCount === 0) { @@ -12453,7 +12452,7 @@ } } } - else if(typeFilter !== g_nFiltersType.autoFilter && autoFilter === null)//если форматированная таблица и отсутсвует а/ф + else if(!filter.isAutoFilter() && autoFilter === null)//если форматированная таблица и отсутсвует а/ф result = false; return result; diff --git a/common/Charts/DrawingObjects.js b/common/Charts/DrawingObjects.js index bdbb36b6ff..57546685c7 100644 --- a/common/Charts/DrawingObjects.js +++ b/common/Charts/DrawingObjects.js @@ -245,10 +245,10 @@ function CreateSparklineMarker(oUniFill) function CreateUniFillFromExcelColor(oExcelColor) { var oUnifill; - if(oExcelColor instanceof ThemeColor) + if(oExcelColor instanceof AscCommonExcel.ThemeColor) { - oUnifill = AscFormat.CreateUnifillSolidFillSchemeColorByIndex(map_themeExcel_to_themePresentation[oExcelColor.theme]); + oUnifill = AscFormat.CreateUnifillSolidFillSchemeColorByIndex(AscCommonExcel.map_themeExcel_to_themePresentation[oExcelColor.theme]); if(oExcelColor.tint != null) { var unicolor = oUnifill.fill.color; diff --git a/common/NumFormat.js b/common/NumFormat.js index 833c365003..51a3cba127 100644 --- a/common/NumFormat.js +++ b/common/NumFormat.js @@ -1294,7 +1294,7 @@ NumFormat.prototype = { if(null == format) format = new NumFormatFont(); - format.c = new RgbColor(this.Color); + format.c = new AscCommonExcel.RgbColor(this.Color); } if(null != prev && ((null == prev.format && null == format) || (null != prev.format && null != format && format.isEqual(prev.format)))) { diff --git a/common/SerializeCommonWordExcel.js b/common/SerializeCommonWordExcel.js index a9927edc69..8fa3be5695 100644 --- a/common/SerializeCommonWordExcel.js +++ b/common/SerializeCommonWordExcel.js @@ -240,7 +240,7 @@ BinaryCommonWriter.prototype.WritePaddings = function(Paddings) }; BinaryCommonWriter.prototype.WriteColorSpreadsheet = function(color) { - if(color instanceof ThemeColor) + if(color instanceof AscCommonExcel.ThemeColor) { if(null != color.theme) {