Commit cb7a8b4c authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

checkDefName

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62834 954022d7-b5bf-4e40-9824-e11837661b57
parent 338652d3
...@@ -2130,6 +2130,10 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2130,6 +2130,10 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
return this.wb.delDefinedNames(oldName); return this.wb.delDefinedNames(oldName);
}; };
spreadsheet_api.prototype.asc_checkDefinedName = function (checkName, scope) {
return this.wb.checkDefName(checkName, scope);
};
spreadsheet_api.prototype.asc_getDefaultDefinedName = function () { spreadsheet_api.prototype.asc_getDefaultDefinedName = function () {
return this.wb.getDefaultDefinedName(); return this.wb.getDefaultDefinedName();
}; };
...@@ -2407,6 +2411,11 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2407,6 +2411,11 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
spreadsheet_api.prototype.asc_findCell = function(reference) { spreadsheet_api.prototype.asc_findCell = function(reference) {
var d = this.wb.findCell(reference ); var d = this.wb.findCell(reference );
if( !d ){
this.handlers.trigger("asc_onError", c_oAscError.ID.InvalidReferenceOrName, c_oAscError.Level.NoCritical);
return;
}
// Получаем sheet по имени // Получаем sheet по имени
var ws = this.wbModel.getWorksheetByName(d.sheet); var ws = this.wbModel.getWorksheetByName(d.sheet);
if (!ws || ws.getHidden()) if (!ws || ws.getHidden())
...@@ -3853,6 +3862,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -3853,6 +3862,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
prot["asc_editDefinedNames"] = prot.asc_editDefinedNames; prot["asc_editDefinedNames"] = prot.asc_editDefinedNames;
prot["asc_delDefinedNames"] = prot.asc_delDefinedNames; prot["asc_delDefinedNames"] = prot.asc_delDefinedNames;
prot["asc_getDefaultDefinedName"] = prot.asc_getDefaultDefinedName; prot["asc_getDefaultDefinedName"] = prot.asc_getDefaultDefinedName;
prot["asc_getDefaultDefinedName"] = prot.asc_checkDefinedName;
// Auto filters interface // Auto filters interface
prot["asc_addAutoFilter"] = prot.asc_addAutoFilter; prot["asc_addAutoFilter"] = prot.asc_addAutoFilter;
......
This diff is collapsed.
...@@ -1949,6 +1949,12 @@ ...@@ -1949,6 +1949,12 @@
}; };
WorkbookView.prototype.checkDefName = function (checkName,scope) {
return this.model.checkDefName(checkName,scope);
};
WorkbookView.prototype.editDefinedNames = function (oldName, newName) { WorkbookView.prototype.editDefinedNames = function (oldName, newName) {
//ToDo проверка defName.ref на знак "=" в начале ссылки. знака нет тогда это либо число либо строка, так делает Excel. //ToDo проверка defName.ref на знак "=" в начале ссылки. знака нет тогда это либо число либо строка, так делает Excel.
var res = this.model.editDefinesNames(oldName, newName); var res = this.model.editDefinesNames(oldName, newName);
......
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