Commit f6c7973e authored by Alexander.Trofimov's avatar Alexander.Trofimov

asc_setLocale check change value

_getRowNoEmpty -> _getRowNoEmptyWithAll (check hidden all)
parent 3f174d20
......@@ -368,14 +368,15 @@ var editor;
if (null === val) {
return;
}
AscCommon.setCurrentCultureInfo(val);
parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSeparator);
if (this.wbModel) {
AscCommon.oGeneralEditFormatCache.cleanCache();
AscCommon.oNumFormatCache.cleanCache();
this.wbModel.rebuildColors();
if (this.IsSendDocumentLoadCompleate) {
this._onUpdateAfterApplyChanges();
if (AscCommon.setCurrentCultureInfo(val)) {
parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSeparator);
if (this.wbModel) {
AscCommon.oGeneralEditFormatCache.cleanCache();
AscCommon.oNumFormatCache.cleanCache();
this.wbModel.rebuildColors();
if (this.IsSendDocumentLoadCompleate) {
this._onUpdateAfterApplyChanges();
}
}
}
};
......
......@@ -1422,7 +1422,7 @@
// ToDo calc all rows (not visible)
for (; ((AscCommonExcel.recalcType.recalc !== type) ? i < l || y + hiddenH < visibleH : i < this.rows.length) &&
i < gc_nMaxRow; ++i) {
row = this.model._getRowNoEmpty(i);
row = this.model._getRowNoEmptyWithAll(i);
if (!row) {
h = -1; // Будет использоваться дефолтная высота строки
isCustomHeight = false;
......
......@@ -3615,7 +3615,11 @@ function escapeRegExp(string) {
return string.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
}
function setCurrentCultureInfo(val) {
if (AscCommon.g_oDefaultCultureInfo === g_aCultureInfos[val]) {
return false;
}
AscCommon.g_oDefaultCultureInfo = g_oDefaultCultureInfo = g_aCultureInfos[val];
return true;
}
var g_aCultureInfos = {
1: { LCID: 1, Name: "ar", CurrencyPositivePattern: 2, CurrencyNegativePattern: 3, CurrencySymbol: "ر.س.‏", NumberDecimalSeparator: ".", NumberGroupSeparator: ",", NumberGroupSizes: [3], DayNames: ["الأحد", "الإثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"], AbbreviatedDayNames: ["الأحد", "الإثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"], MonthNames: ["محرم", "صفر", "ربيع الأول", "ربيع الثاني", "جمادى الأولى", "جمادى الثانية", "رجب", "شعبان", "رمضان", "شوال", "ذو القعدة", "ذو الحجة", ""], AbbreviatedMonthNames: ["محرم", "صفر", "ربيع الأول", "ربيع الثاني", "جمادى الأولى", "جمادى الثانية", "رجب", "شعبان", "رمضان", "شوال", "ذو القعدة", "ذو الحجة", ""], MonthGenitiveNames: [], AbbreviatedMonthGenitiveNames: [], AMDesignator: "ص", PMDesignator: "م", DateSeparator: "/", TimeSeparator: ":", ShortDatePattern: "012" },
......
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