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

fix bug #30259

При смене цветовой схемы, нужно отправить сообщение об обновлении цвета листа, если он есть.
delete unused asc_getWorksheetNameById, asc_getEditorFonts, asc_getThemeColorSchemes, asc_getEditorShapes, asc_getStandartTextures

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64869 954022d7-b5bf-4e40-9824-e11837661b57
parent 92e0ccf7
...@@ -2103,11 +2103,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2103,11 +2103,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
return this.wbModel.getWorksheet(index).getName(); return this.wbModel.getWorksheet(index).getName();
}; };
spreadsheet_api.prototype.asc_getWorksheetNameById = function(id) {
return this.wbModel.getWorksheetById(id).getName();
};
spreadsheet_api.prototype.asc_getWorksheetTabColor = function(index) { spreadsheet_api.prototype.asc_getWorksheetTabColor = function(index) {
return this.wbModel.getWorksheet(index).getTabColor(); return this.wbModel.getWorksheet(index).getTabColor();
}; };
...@@ -3675,13 +3670,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -3675,13 +3670,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
prot["asc_SetDocumentPlaceChangedEnabled"] = prot.asc_SetDocumentPlaceChangedEnabled; prot["asc_SetDocumentPlaceChangedEnabled"] = prot.asc_SetDocumentPlaceChangedEnabled;
// Toolbar interface
/*prot["asc_getEditorFonts"] = prot.asc_getEditorFonts;
prot["asc_getThemeColorSchemes"] = prot.asc_getThemeColorSchemes;
prot["asc_getEditorShapes"] = prot.asc_getEditorShapes;
prot["asc_getStandartTextures"] = prot.asc_getStandartTextures;*/
// Workbook interface // Workbook interface
prot["asc_getWorksheetsCount"] = prot.asc_getWorksheetsCount; prot["asc_getWorksheetsCount"] = prot.asc_getWorksheetsCount;
......
...@@ -3030,6 +3030,7 @@ Woorksheet.prototype.rebuildColors=function(){ ...@@ -3030,6 +3030,7 @@ Woorksheet.prototype.rebuildColors=function(){
this._forEachCell(function(cell){ this._forEachCell(function(cell){
cell.cleanCache(); cell.cleanCache();
}); });
this.rebuildTabColor();
}; };
Woorksheet.prototype.generateFontMap=function(oFontMap){ Woorksheet.prototype.generateFontMap=function(oFontMap){
//пробегаемся по Drawing //пробегаемся по Drawing
...@@ -3301,6 +3302,11 @@ Woorksheet.prototype.setTabColor=function(color){ ...@@ -3301,6 +3302,11 @@ Woorksheet.prototype.setTabColor=function(color){
if (!this.workbook.bUndoChanges && !this.workbook.bRedoChanges) if (!this.workbook.bUndoChanges && !this.workbook.bRedoChanges)
this.workbook.handlers.trigger("asc_onUpdateTabColor", this.getIndex()); this.workbook.handlers.trigger("asc_onUpdateTabColor", this.getIndex());
}; };
Woorksheet.prototype.rebuildTabColor = function() {
if (this.sheetPr && this.sheetPr.TabColor) {
this.workbook.handlers.trigger("asc_onUpdateTabColor", this.getIndex());
}
};
Woorksheet.prototype.renameWsToCollaborate=function(name){ Woorksheet.prototype.renameWsToCollaborate=function(name){
var lastname = this.getName(); var lastname = this.getName();
//из-за особенностей реализации формул, сначала делаем parse со старым именем, потом преименовываем, потом assemble //из-за особенностей реализации формул, сначала делаем parse со старым именем, потом преименовываем, потом assemble
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment