From 56671320248850b02ea62ddbc7dc5af29bae4d6b Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 28 Aug 2018 17:52:21 +0300
Subject: [PATCH] [DE] Fix 38604

---
 apps/documenteditor/main/app/controller/Toolbar.js         | 2 +-
 apps/documenteditor/main/app/view/ControlSettingsDialog.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 2255c4295..973a3eaa8 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -897,7 +897,7 @@ define([
             if (show){
                 var clr = this.api.asc_GetGlobalContentControlHighlightColor();
                 if (clr) {
-                    clr = Common.Utils.ThemeColor.getHexColor(clr.r, clr.g, clr.b);
+                    clr = Common.Utils.ThemeColor.getHexColor(clr.get_r(), clr.get_g(), clr.get_b());
                     this.toolbar.mnuControlsColorPicker.selectByRGB(clr, true);
                 }
             }
diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
index ec509f6a1..fa6706319 100644
--- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
@@ -247,7 +247,7 @@ define([
                 (val!==null && val!==undefined) && this.cmbShow.setValue(val);
 
                 val = props.get_Color();
-                val = (val) ? Common.Utils.ThemeColor.getHexColor(val.r, val.g, val.b) : '#000000';
+                val = (val) ? Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b()) : '#000000';
                 this.btnColor.setColor(val);
                 this.colors.selectByRGB(val,true);