Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
9c579edf
Commit
9c579edf
authored
Aug 30, 2017
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug #35744
parent
3f024b56
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
word/Editor/Paragraph.js
word/Editor/Paragraph.js
+2
-2
word/api.js
word/api.js
+3
-0
No files found.
word/Editor/Paragraph.js
View file @
9c579edf
...
@@ -1402,7 +1402,7 @@ Paragraph.prototype.Internal_Draw_1 = function(CurPage, pGraphics, Pr)
...
@@ -1402,7 +1402,7 @@ Paragraph.prototype.Internal_Draw_1 = function(CurPage, pGraphics, Pr)
if
(
this
.
bFromDocument
&&
(
pGraphics
.
RENDERER_PDF_FLAG
!==
true
))
if
(
this
.
bFromDocument
&&
(
pGraphics
.
RENDERER_PDF_FLAG
!==
true
))
{
{
// Если данный параграф зажат другим пользователем, рисуем соответствующий знак
// Если данный параграф зажат другим пользователем, рисуем соответствующий знак
if
(
AscCommon
.
locktype_None
!=
this
.
Lock
.
Get_Type
())
if
(
AscCommon
.
locktype_None
!=
this
.
Lock
.
Get_Type
()
&&
this
.
LogicDocument
&&
!
this
.
LogicDocument
.
IsViewModeInReview
()
)
{
{
if
((
CurPage
>
0
||
false
===
this
.
IsStartFromNewPage
()
||
null
===
this
.
Get_DocumentPrev
()
))
if
((
CurPage
>
0
||
false
===
this
.
IsStartFromNewPage
()
||
null
===
this
.
Get_DocumentPrev
()
))
{
{
...
@@ -9237,7 +9237,7 @@ Paragraph.prototype.UpdateCursorType = function(X, Y, CurPage)
...
@@ -9237,7 +9237,7 @@ Paragraph.prototype.UpdateCursorType = function(X, Y, CurPage)
this
.
DrawingDocument
.
SetCursorType
(
"
default
"
,
MMData
);
this
.
DrawingDocument
.
SetCursorType
(
"
default
"
,
MMData
);
var
Bounds
=
this
.
Pages
[
CurPage
].
Bounds
;
var
Bounds
=
this
.
Pages
[
CurPage
].
Bounds
;
if
(
true
===
this
.
Lock
.
Is_Locked
()
&&
X
<
Bounds
.
Right
&&
X
>
Bounds
.
Left
&&
Y
>
Bounds
.
Top
&&
Y
<
Bounds
.
Bottom
)
if
(
true
===
this
.
Lock
.
Is_Locked
()
&&
X
<
Bounds
.
Right
&&
X
>
Bounds
.
Left
&&
Y
>
Bounds
.
Top
&&
Y
<
Bounds
.
Bottom
&&
this
.
LogicDocument
&&
!
this
.
LogicDocument
.
IsViewModeInReview
()
)
{
{
var
_X
=
this
.
Pages
[
CurPage
].
X
;
var
_X
=
this
.
Pages
[
CurPage
].
X
;
var
_Y
=
this
.
Pages
[
CurPage
].
Y
;
var
_Y
=
this
.
Pages
[
CurPage
].
Y
;
...
...
word/api.js
View file @
9c579edf
...
@@ -2357,6 +2357,9 @@ background-repeat: no-repeat;\
...
@@ -2357,6 +2357,9 @@ background-repeat: no-repeat;\
};
};
asc_docs_api
.
prototype
.
asc_Save
=
function
(
isAutoSave
,
isUndoRequest
,
isIdle
)
asc_docs_api
.
prototype
.
asc_Save
=
function
(
isAutoSave
,
isUndoRequest
,
isIdle
)
{
{
if
(
this
.
WordControl
.
m_oLogicDocument
.
IsViewModeInReview
())
return
false
;
var
res
=
false
;
var
res
=
false
;
this
.
IsUserSave
=
!
isAutoSave
;
this
.
IsUserSave
=
!
isAutoSave
;
if
(
this
.
saveCheck
())
if
(
this
.
saveCheck
())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment