Commit 0bc416db authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Перенес глобальный класс настроек формулы в глобальные настройки документа.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60970 954022d7-b5bf-4e40-9824-e11837661b57
parent d6b68a37
...@@ -629,6 +629,11 @@ function CDocument(DrawingDocument) ...@@ -629,6 +629,11 @@ function CDocument(DrawingDocument)
this.ContentLastChangePos = 0; this.ContentLastChangePos = 0;
this.Settings =
{
MathSettings : CMathSettings ? new CMathSettings() : {}
};
this.CurPos = this.CurPos =
{ {
X : 0, X : 0,
......
...@@ -9,6 +9,14 @@ var g_dMathArgSizeKoeff_2 = 0.76 * 0.855; ...@@ -9,6 +9,14 @@ var g_dMathArgSizeKoeff_2 = 0.76 * 0.855;
var g_oMathSettings = {}; var g_oMathSettings = {};
function Get_WordDocumentDefaultMathSettings()
{
if (!editor)
return new CMathSettings();
return editor.WordControl.m_oLogicDocument.Settings.MathSettings;
}
function MathMenu (type) function MathMenu (type)
{ {
this.Type = para_Math; this.Type = para_Math;
......
...@@ -262,10 +262,11 @@ CNary.prototype.ApplyProperties = function(RPI) ...@@ -262,10 +262,11 @@ CNary.prototype.ApplyProperties = function(RPI)
{ {
var bIntegral = oSign.chrCode > 0x222A && oSign.chrCode < 0x2231; var bIntegral = oSign.chrCode > 0x222A && oSign.chrCode < 0x2231;
var oMathSettings = Get_WordDocumentDefaultMathSettings();
if(bIntegral) if(bIntegral)
limLoc = g_oMathSettings.intLim; limLoc = oMathSettings.intLim;
else else
limLoc = g_oMathSettings.naryLim; limLoc = oMathSettings.naryLim;
} }
var PropsInfo = var PropsInfo =
......
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