From 266b688259574794dab5b24ed2660f086e100ee0 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 18 Aug 2017 13:12:18 +0300
Subject: [PATCH] Fix Bug 35517.

---
 apps/common/mobile/resources/img/shapes/shape-06.svg   | 10 ++++------
 apps/common/mobile/resources/img/shapes/shape-15.svg   |  9 ++++-----
 apps/common/mobile/resources/img/shapes/shape-16.svg   | 10 +++++-----
 .../mobile/app/controller/add/AddShape.js              |  4 ++--
 .../mobile/resources/img/shapes/shape-06.svg           | 10 ++++------
 .../mobile/resources/img/shapes/shape-15.svg           |  9 ++++-----
 .../mobile/resources/img/shapes/shape-16.svg           | 10 +++++-----
 .../mobile/app/controller/add/AddShape.js              |  4 ++--
 .../mobile/resources/img/shapes/shape-06.svg           | 10 ++++------
 .../mobile/resources/img/shapes/shape-15.svg           |  9 ++++-----
 .../mobile/resources/img/shapes/shape-16.svg           | 10 +++++-----
 .../mobile/app/controller/add/AddShape.js              |  4 ++--
 12 files changed, 45 insertions(+), 54 deletions(-)

diff --git a/apps/common/mobile/resources/img/shapes/shape-06.svg b/apps/common/mobile/resources/img/shapes/shape-06.svg
index b081f5b0f..8c1066376 100644
--- a/apps/common/mobile/resources/img/shapes/shape-06.svg
+++ b/apps/common/mobile/resources/img/shapes/shape-06.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;}
-</style>
-<path class="st0" d="M17,8.5h31.5L56,16v31.5L48.5,55H17l-7.5-7.5V16L17,8.5z"/>
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<polygon points="18.576,55 5.153,31.75 18.576,8.5 45.424,8.5 58.848,31.75 45.424,55 "/>
 </svg>
diff --git a/apps/common/mobile/resources/img/shapes/shape-15.svg b/apps/common/mobile/resources/img/shapes/shape-15.svg
index 630a50d74..6b336d2de 100644
--- a/apps/common/mobile/resources/img/shapes/shape-15.svg
+++ b/apps/common/mobile/resources/img/shapes/shape-15.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<g>
-	<polygon id="XMLID_2_" points="56,30 56,25 25,25 25,14 9.5,27.3 25,40.5 25,30 51,30 51,50 56,50 56,30 	"/>
-</g>
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<path d="M32.5,55.5l-23-23.3L32.5,9v13H56v20H32.5V55.5z"/>
 </svg>
diff --git a/apps/common/mobile/resources/img/shapes/shape-16.svg b/apps/common/mobile/resources/img/shapes/shape-16.svg
index 03a3400ae..90a76760b 100644
--- a/apps/common/mobile/resources/img/shapes/shape-16.svg
+++ b/apps/common/mobile/resources/img/shapes/shape-16.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<g id="XMLID_3_">
-	<polygon id="XMLID_2_" points="9.5,30 9.5,25 40.5,25 40.5,14 56,27.3 40.5,40.5 40.5,30 14.5,30 14.5,50 9.5,50 9.5,30 	"/>
-</g>
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<polygon id="XMLID_2_" points="43.75,53.25 43.75,25.25 53.75,25.25 38.45,7.75 23.25,25.25 32.75,25.25 32.75,42.25 11.75,42.25 
+	11.75,53.25 "/>
 </svg>
diff --git a/apps/documenteditor/mobile/app/controller/add/AddShape.js b/apps/documenteditor/mobile/app/controller/add/AddShape.js
index a8a83cf23..fe165413b 100644
--- a/apps/documenteditor/mobile/app/controller/add/AddShape.js
+++ b/apps/documenteditor/mobile/app/controller/add/AddShape.js
@@ -142,12 +142,12 @@ define([
                     {
                         title: 'Left arrow callout',
                         thumb: 'shape-15.svg',
-                        type: 'leftArrowCallout'
+                        type: 'leftArrow'
                     },
                     {
                         title: 'Right arrow callout',
                         thumb: 'shape-16.svg',
-                        type: 'rightArrowCallout'
+                        type: 'bentUpArrow'
                     },
                     {
                         title: 'Flow chart off page connector',
diff --git a/apps/documenteditor/mobile/resources/img/shapes/shape-06.svg b/apps/documenteditor/mobile/resources/img/shapes/shape-06.svg
index e48b1673b..31dfc90db 100644
--- a/apps/documenteditor/mobile/resources/img/shapes/shape-06.svg
+++ b/apps/documenteditor/mobile/resources/img/shapes/shape-06.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;}
-</style>
-<path class="st0" d="M17,8.5h31.5L56,16v31.5L48.5,55H17l-7.5-7.5V16L17,8.5z"/>
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<polygon points="18.576,55 5.153,31.75 18.576,8.5 45.424,8.5 58.848,31.75 45.424,55 "/>
 </svg>
diff --git a/apps/documenteditor/mobile/resources/img/shapes/shape-15.svg b/apps/documenteditor/mobile/resources/img/shapes/shape-15.svg
index a1b230aca..455c585d1 100644
--- a/apps/documenteditor/mobile/resources/img/shapes/shape-15.svg
+++ b/apps/documenteditor/mobile/resources/img/shapes/shape-15.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<g>
-	<polygon id="XMLID_2_" points="56,30 56,25 25,25 25,14 9.5,27.3 25,40.5 25,30 51,30 51,50 56,50 56,30 	"/>
-</g>
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<path d="M32.5,55.5l-23-23.3L32.5,9v13H56v20H32.5V55.5z"/>
 </svg>
diff --git a/apps/documenteditor/mobile/resources/img/shapes/shape-16.svg b/apps/documenteditor/mobile/resources/img/shapes/shape-16.svg
index d67b66757..070d80800 100644
--- a/apps/documenteditor/mobile/resources/img/shapes/shape-16.svg
+++ b/apps/documenteditor/mobile/resources/img/shapes/shape-16.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<g id="XMLID_3_">
-	<polygon id="XMLID_2_" points="9.5,30 9.5,25 40.5,25 40.5,14 56,27.3 40.5,40.5 40.5,30 14.5,30 14.5,50 9.5,50 9.5,30 	"/>
-</g>
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<polygon id="XMLID_2_" points="43.75,53.25 43.75,25.25 53.75,25.25 38.45,7.75 23.25,25.25 32.75,25.25 32.75,42.25 11.75,42.25 
+	11.75,53.25 "/>
 </svg>
diff --git a/apps/presentationeditor/mobile/app/controller/add/AddShape.js b/apps/presentationeditor/mobile/app/controller/add/AddShape.js
index 09fcc7ff0..2364c4072 100644
--- a/apps/presentationeditor/mobile/app/controller/add/AddShape.js
+++ b/apps/presentationeditor/mobile/app/controller/add/AddShape.js
@@ -139,12 +139,12 @@ define([
                     {
                         title: 'Left arrow callout',
                         thumb: 'shape-15.svg',
-                        type: 'leftArrowCallout'
+                        type: 'leftArrow'
                     },
                     {
                         title: 'Right arrow callout',
                         thumb: 'shape-16.svg',
-                        type: 'rightArrowCallout'
+                        type: 'bentUpArrow'
                     },
                     {
                         title: 'Flow chart off page connector',
diff --git a/apps/presentationeditor/mobile/resources/img/shapes/shape-06.svg b/apps/presentationeditor/mobile/resources/img/shapes/shape-06.svg
index e48b1673b..31dfc90db 100644
--- a/apps/presentationeditor/mobile/resources/img/shapes/shape-06.svg
+++ b/apps/presentationeditor/mobile/resources/img/shapes/shape-06.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;}
-</style>
-<path class="st0" d="M17,8.5h31.5L56,16v31.5L48.5,55H17l-7.5-7.5V16L17,8.5z"/>
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<polygon points="18.576,55 5.153,31.75 18.576,8.5 45.424,8.5 58.848,31.75 45.424,55 "/>
 </svg>
diff --git a/apps/presentationeditor/mobile/resources/img/shapes/shape-15.svg b/apps/presentationeditor/mobile/resources/img/shapes/shape-15.svg
index a1b230aca..455c585d1 100644
--- a/apps/presentationeditor/mobile/resources/img/shapes/shape-15.svg
+++ b/apps/presentationeditor/mobile/resources/img/shapes/shape-15.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<g>
-	<polygon id="XMLID_2_" points="56,30 56,25 25,25 25,14 9.5,27.3 25,40.5 25,30 51,30 51,50 56,50 56,30 	"/>
-</g>
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<path d="M32.5,55.5l-23-23.3L32.5,9v13H56v20H32.5V55.5z"/>
 </svg>
diff --git a/apps/presentationeditor/mobile/resources/img/shapes/shape-16.svg b/apps/presentationeditor/mobile/resources/img/shapes/shape-16.svg
index d67b66757..070d80800 100644
--- a/apps/presentationeditor/mobile/resources/img/shapes/shape-16.svg
+++ b/apps/presentationeditor/mobile/resources/img/shapes/shape-16.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<g id="XMLID_3_">
-	<polygon id="XMLID_2_" points="9.5,30 9.5,25 40.5,25 40.5,14 56,27.3 40.5,40.5 40.5,30 14.5,30 14.5,50 9.5,50 9.5,30 	"/>
-</g>
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<polygon id="XMLID_2_" points="43.75,53.25 43.75,25.25 53.75,25.25 38.45,7.75 23.25,25.25 32.75,25.25 32.75,42.25 11.75,42.25 
+	11.75,53.25 "/>
 </svg>
diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddShape.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddShape.js
index 21c95a687..7c9ba5306 100644
--- a/apps/spreadsheeteditor/mobile/app/controller/add/AddShape.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddShape.js
@@ -138,12 +138,12 @@ define([
                     {
                         title: 'Left arrow callout',
                         thumb: 'shape-15.svg',
-                        type: 'leftArrowCallout'
+                        type: 'leftArrow'
                     },
                     {
                         title: 'Right arrow callout',
                         thumb: 'shape-16.svg',
-                        type: 'rightArrowCallout'
+                        type: 'bentUpArrow'
                     },
                     {
                         title: 'Flow chart off page connector',