Commit 665c6694 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

margins rulers section

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55896 954022d7-b5bf-4e40-9824-e11837661b57
parent 7156771d
...@@ -760,7 +760,7 @@ CDrawingDocument.prototype = ...@@ -760,7 +760,7 @@ CDrawingDocument.prototype =
this.Native["DD_Set_RulerState_Table"](_array_params1, markup.Cols, _array_params_margins, _array_params_rows); this.Native["DD_Set_RulerState_Table"](_array_params1, markup.Cols, _array_params_margins, _array_params_rows);
}, },
Set_RulerState_Paragraph : function(margins) Set_RulerState_Paragraph : function(margins, isCanTrackMargins)
{ {
if (margins && margins.Frame !== undefined) if (margins && margins.Frame !== undefined)
{ {
......
...@@ -4046,7 +4046,7 @@ function CDrawingDocument() ...@@ -4046,7 +4046,7 @@ function CDrawingDocument()
} }
} }
this.Set_RulerState_Paragraph = function(margins) this.Set_RulerState_Paragraph = function(margins, isCanTrackMargins)
{ {
if (margins && margins.Frame !== undefined) if (margins && margins.Frame !== undefined)
{ {
...@@ -4146,8 +4146,16 @@ function CDrawingDocument() ...@@ -4146,8 +4146,16 @@ function CDrawingDocument()
ver_ruler.CreateBackground(cachedPage); ver_ruler.CreateBackground(cachedPage);
// disable margins // disable margins
if (true !== isCanTrackMargins)
{
hor_ruler.IsCanMoveMargins = false; hor_ruler.IsCanMoveMargins = false;
ver_ruler.IsCanMoveMargins = false; ver_ruler.IsCanMoveMargins = false;
}
else
{
hor_ruler.IsCanMoveMargins = true;
ver_ruler.IsCanMoveMargins = true;
}
this.LastParagraphMargins = {}; this.LastParagraphMargins = {};
this.LastParagraphMargins.L = margins.L; this.LastParagraphMargins.L = margins.L;
......
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