Commit f0c9151b authored by SergeyLuzyanin's avatar SergeyLuzyanin

fix Bug 35430

parent 797c8939
......@@ -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;
}
......
......@@ -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;
......
......@@ -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())
......
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