pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/hotfix/v8.3.2' into release/v9.0.0

Browse Source 
# Conflicts:
#	slide/Drawing/HtmlPage.js
#	word/apiBuilder.js
This commit is contained in:
Sergey Luzyanin
2025-03-12 12:19:41 +03:00
parent 51d17a4e86 0fae1be839
commit 89bffe49ac
46 changed files with 1686 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/AdvancedOptions.js
View File

@ -105,6 +105,13 @@
asc_CTextOptions.prototype.asc_getDelimiterChar = function(){return this.delimiterChar;};
asc_CTextOptions.prototype.asc_setDelimiterChar = function(v){this.delimiterChar = v;};
asc_CTextOptions.prototype.asc_getCodePage = function(){return this.codePage;};
asc_CTextOptions.prototype.asc_getCodePageOrDefault = function() {
//c_oAscCodePageNone is invalid codepage for convertion. undefined codepage cause repeated dialog
if (this.codePage === AscCommon.c_oAscCodePageNone || this.codePage === undefined || this.codePage === null) {
return AscCommon.c_oAscCodePageUtf8;
}
return this.codePage;
};
asc_CTextOptions.prototype.asc_setCodePage = function(v){this.codePage = v;};
asc_CTextOptions.prototype.asc_getNumberDecimalSeparator = function () {
return this.numberDecimalSeparator !== null ? this.numberDecimalSeparator : AscCommon.g_oDefaultCultureInfo.NumberDecimalSeparator;
@ -232,6 +239,7 @@
prot["asc_getDelimiterChar"] = prot.asc_getDelimiterChar;
prot["asc_setDelimiterChar"] = prot.asc_setDelimiterChar;
prot["asc_getCodePage"] = prot.asc_getCodePage;
prot["asc_getCodePageOrDefault"] = prot.asc_getCodePageOrDefault;
prot["asc_setCodePage"] = prot.asc_setCodePage;
prot["asc_setNumberDecimalSeparator"] = prot.asc_setNumberDecimalSeparator;
prot["asc_setNumberGroupSeparator"] = prot.asc_setNumberGroupSeparator;