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
f0c9151b
Commit
f0c9151b
authored
Jul 25, 2017
by
SergeyLuzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Bug 35430
parent
797c8939
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
common/Drawings/Format/Format.js
common/Drawings/Format/Format.js
+3
-0
common/wordcopypaste.js
common/wordcopypaste.js
+6
-0
slide/Editor/Format/Presentation.js
slide/Editor/Format/Presentation.js
+6
-0
No files found.
common/Drawings/Format/Format.js
View file @
f0c9151b
...
...
@@ -8940,6 +8940,9 @@ function GenerateDefaultSlide(layout)
var
slide
=
new
Slide
(
layout
.
Master
.
presentation
,
layout
,
0
);
slide
.
Master
=
layout
.
Master
;
slide
.
Theme
=
layout
.
Master
.
Theme
;
slide
.
setNotes
(
AscCommonSlide
.
CreateNotes
());
slide
.
notes
.
setNotesMaster
(
layout
.
Master
.
presentation
.
notesMasters
[
0
]);
slide
.
notes
.
setSlide
(
slide
);
return
slide
;
}
...
...
common/wordcopypaste.js
View file @
f0c9151b
...
...
@@ -3910,6 +3910,12 @@ PasteProcessor.prototype =
var
oNotes
=
loader
.
ReadNote
();
oNotes
.
setNotesMaster
(
loader
.
presentation
.
notesMasters
[
0
]);
arr_slides
[
i
].
setNotes
(
oNotes
);
arr_slides
[
i
].
notes
.
setSlide
(
arr_slides
[
i
]);
}
else
{
arr_slides
[
i
].
setNotes
(
AscCommonSlide
.
CreateNotes
());
arr_slides
[
i
].
notes
.
setNotesMaster
(
loader
.
presentation
.
notesMasters
[
0
]);
arr_slides
[
i
].
notes
.
setSlide
(
arr_slides
[
i
]);
}
var
sp_tree
=
arr_slides
[
i
].
cSld
.
spTree
;
var
t
=
0
;
...
...
slide/Editor/Format/Presentation.js
View file @
f0c9151b
...
...
@@ -5009,6 +5009,9 @@ CPresentation.prototype =
layout
=
AscFormat
.
isRealNumber
(
layoutIndex
)
?
(
cur_slide
.
Layout
.
Master
.
sldLayoutLst
[
layoutIndex
]
?
cur_slide
.
Layout
.
Master
.
sldLayoutLst
[
layoutIndex
]:
cur_slide
.
Layout
)
:
cur_slide
.
Layout
.
Master
.
getMatchingLayout
(
cur_slide
.
Layout
.
type
,
cur_slide
.
Layout
.
matchingName
,
cur_slide
.
Layout
.
cSld
.
name
);
new_slide
=
new
Slide
(
this
,
layout
,
this
.
CurPage
+
1
);
new_slide
.
setNotes
(
AscCommonSlide
.
CreateNotes
());
new_slide
.
notes
.
setNotesMaster
(
this
.
notesMasters
[
0
]);
new_slide
.
notes
.
setSlide
(
new_slide
);
for
(
i
=
0
;
i
<
layout
.
cSld
.
spTree
.
length
;
++
i
)
{
if
(
layout
.
cSld
.
spTree
[
i
].
isPlaceholder
())
...
...
@@ -5041,6 +5044,9 @@ CPresentation.prototype =
new_slide
=
new
Slide
(
this
,
layout
,
this
.
CurPage
+
1
);
new_slide
.
setNotes
(
AscCommonSlide
.
CreateNotes
());
new_slide
.
notes
.
setNotesMaster
(
this
.
notesMasters
[
0
]);
new_slide
.
notes
.
setSlide
(
new_slide
);
for
(
i
=
0
;
i
<
layout
.
cSld
.
spTree
.
length
;
++
i
)
{
if
(
layout
.
cSld
.
spTree
[
i
].
isPlaceholder
())
...
...
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