notes

slide/Editor/DrawingObjectsController.js

@@ -42,7 +42,7 @@ var History = AscCommon.History;
 
 DrawingObjectsController.prototype.getTheme = function()
 {
-    return this.drawingObjects.Layout.Master.Theme;
+    return this.drawingObjects.getTheme();
 };
 
 DrawingObjectsController.prototype.getDrawingArray = function()
@@ -81,6 +81,13 @@ DrawingObjectsController.prototype.getColorMap = function()
                 }
             }
         }
+        else if(this.drawingObjects.Master )
+        {
+            if(this.drawingObjects.Master.clrMap)
+            {
+                return this.drawingObjects.Master.clrMap;
+            }
+        }
     }
     return AscFormat.G_O_DEFAULT_COLOR_MAP;
 };
@@ -157,11 +164,6 @@ DrawingObjectsController.prototype.getDrawingDocument = function()
 {
     return editor.WordControl.m_oDrawingDocument;
 };
-DrawingObjectsController.prototype.getTheme = function()
-{
-    return this.drawingObjects.Layout.Master.Theme;
-};
-
 
 DrawingObjectsController.prototype.onMouseDown = function(e, x, y)
 {
@@ -299,6 +301,9 @@ DrawingObjectsController.prototype.editChart = function(binary)
 DrawingObjectsController.prototype.handleSlideComments  =  function(e, x, y, pageIndex)
 {
 
+    if(!this.drawingObjects.slideComments){
+        return;
+    }
     var comments = this.drawingObjects.slideComments.comments, i, index_selected = -1;
     var ret = {result: null, selectedIndex: -1};
     if(this.handleEventMode === HANDLE_EVENT_MODE_HANDLE)

slide/Editor/Format/Notes.js

@@ -178,6 +178,15 @@
         }
     };
 
+    CNotes.prototype.getDrawingDocument = function()
+    {
+        return editor.WordControl.m_oDrawingDocument;
+    };
+
+    CNotes.prototype.getTheme = function(){
+        return this.Master.Theme;
+    };
+
     function CreateNotes(){
         var oN = new CNotes();
         var oSp = new AscFormat.CShape();

slide/Editor/Format/Slide.js

@@ -1102,6 +1102,10 @@ Slide.prototype =
         }
     },
 
+    getTheme: function(){
+        return this.Layout.Master.Theme;
+    },
+
     drawSelect: function(_type)
     {
         if (_type === undefined)