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
272f5ee8
Commit
272f5ee8
authored
Mar 01, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 34193
parent
5a32ed38
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
word/Editor/Serialize2.js
word/Editor/Serialize2.js
+9
-5
No files found.
word/Editor/Serialize2.js
View file @
272f5ee8
...
@@ -6165,9 +6165,10 @@ function BinaryFileReader(doc, openParams)
...
@@ -6165,9 +6165,10 @@ function BinaryFileReader(doc, openParams)
};
};
this
.
ReadFromString
=
function
(
sBase64
,
isCopyPaste
)
{
this
.
ReadFromString
=
function
(
sBase64
,
isCopyPaste
)
{
//надо сбросить то, что остался после открытия документа
//надо сбросить то, что остался после открытия документа
var
api
=
this
.
Document
.
DrawingDocument
.
m_oWordControl
.
m_oApi
;
var
api
=
isCopyPaste
?
this
.
Document
.
DrawingDocument
.
m_oWordControl
.
m_oApi
:
null
;
var
insertDocumentUrlsData
=
api
?
api
.
insertDocumentUrlsData
:
null
;
pptx_content_loader
.
Clear
();
pptx_content_loader
.
Clear
();
pptx_content_loader
.
Start_UseFullUrl
(
api
.
insertDocumentUrlsData
);
pptx_content_loader
.
Start_UseFullUrl
(
insertDocumentUrlsData
);
this
.
stream
=
this
.
getbase64DecodedData
(
sBase64
);
this
.
stream
=
this
.
getbase64DecodedData
(
sBase64
);
this
.
ReadMainTable
();
this
.
ReadMainTable
();
var
oReadResult
=
this
.
oReadResult
;
var
oReadResult
=
this
.
oReadResult
;
...
@@ -6452,10 +6453,13 @@ function BinaryFileReader(doc, openParams)
...
@@ -6452,10 +6453,13 @@ function BinaryFileReader(doc, openParams)
}
}
}
}
//посылаем событие о добавлении комментариев
//посылаем событие о добавлении комментариев
if
(
api
)
{
for
(
var
i
in
oCommentsNewId
)
for
(
var
i
in
oCommentsNewId
)
{
{
var
oNewComment
=
oCommentsNewId
[
i
];
var
oNewComment
=
oCommentsNewId
[
i
];
this
.
Document
.
DrawingDocument
.
m_oWordControl
.
m_oApi
.
sync_AddComment
(
oNewComment
.
Id
,
oNewComment
.
Data
);
api
.
sync_AddComment
(
oNewComment
.
Id
,
oNewComment
.
Data
);
}
}
}
for
(
var
i
=
0
,
length
=
this
.
oReadResult
.
aTableCorrect
.
length
;
i
<
length
;
++
i
)
{
for
(
var
i
=
0
,
length
=
this
.
oReadResult
.
aTableCorrect
.
length
;
i
<
length
;
++
i
)
{
var
table
=
this
.
oReadResult
.
aTableCorrect
[
i
];
var
table
=
this
.
oReadResult
.
aTableCorrect
[
i
];
...
...
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