Merge branch 'release/4.0.1' into develop

e30d1027 · Sergey Luzyanin · cc17d391 · 53af754c · e30d1027 · e30d1027
Commit e30d1027 authored Jul 06, 2016 by Sergey Luzyanin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 331 additions and 288 deletions

cell/apiBuilder.js cell/apiBuilder.js +327 -287

word/Editor/GraphicObjects/GraphicObjects.js word/Editor/GraphicObjects/GraphicObjects.js +4 -1

No files found.
--- a/cell/apiBuilder.js
+++ b/cell/apiBuilder.js
--- a/word/Editor/GraphicObjects/GraphicObjects.js
+++ b/word/Editor/GraphicObjects/GraphicObjects.js
@@ -1256,7 +1256,10 @@ CGraphicObjects.prototype =

    handleOleObjectDoubleClick: function(drawing, oleObject, e, x, y, pageIndex)
    {
-        if(false === this.document.Document_Is_SelectionLocked(changestype_Drawing_Props))
+		if(drawing && drawing.ParaMath){
+			drawing.Convert_ToMathObject();
+		}
+        else if(false === this.document.Document_Is_SelectionLocked(changestype_Drawing_Props))
        {
            var pluginData = new Asc.CPluginData();
            pluginData.setAttribute("data", oleObject.m_sData);