Merge remote-tracking branch 'remotes/origin/develop' into feature/sparklines

Makefile

 GRUNT = grunt
-GRUNT_FLAGS = --no-color -v
+GRUNT_FLAGS = --private=true --no-color -v 
 
 OUTPUT_DIR = deploy
 OUTPUT = $(OUTPUT_DIR)

build/Gruntfile.js

@@ -173,7 +173,7 @@ module.exports = function(grunt) {
 			});		
 			var mobileFiles = packageFile['compile']['sdk']['mobile'];
 			if(mobileFiles){
-				srcFiles = srcFiles.concat(mobileFiles);
+				srcFiles = mobileFiles.concat(srcFiles);
 			}
 		}
 		

build/configs/nativeword.json

@@ -112,7 +112,7 @@
                 "../word/Editor/FontClassification.js",
                 "../word/Editor/Spelling.js",
                 "../word/Drawing/Graphics.js",
-                "../word/Drawing/Overlay.js",
+                "../common/Overlay.js",
                 "../word/Drawing/HatchPattern.js",
 
                 "../word/Drawing/Metafile.js",

build/configs/webexcel.json

 {
     "info": {
-        "version": "3.7.0",
+        "version": "3.8.0",
         "build": 148
     },
     "update_src": {
@@ -107,7 +107,7 @@
                 "../common/wordcopypaste.js",
                 "../cell/view/DrawingObjectsController.js",
                 "../cell/model/DrawingObjects/Graphics.js",
-                "../cell/model/DrawingObjects/Overlay.js",
+                "../common/Overlay.js",
                 "../common/Controls.js",
                 "../cell/model/DrawingObjects/ShapeDrawer.js",
                 "../cell/model/DrawingObjects/DrawingDocument.js",

build/configs/webpowerpoint.json

 {
     "info": {
-        "version": "3.7.0",
+        "version": "3.8.0",
         "build": 158
     },
     "update_src": {
@@ -65,7 +65,7 @@
                 "../common/Drawings/TrackObjects/MoveTracks.js",
                 "../word/Drawing/HatchPattern.js",
                 "../word/Drawing/Graphics.js",
-                "../word/Drawing/Overlay.js",
+                "../common/Overlay.js",
                 "../word/Drawing/ShapeDrawer.js",
                 "../slide/Drawing/Transitions.js",
                 "../slide/Drawing/DrawingDocument.js",
@@ -171,7 +171,7 @@
             "exclude_mobile": [
                 "../common/browser.js",
                 "../word/Drawing/ShapeDrawer.js",
-                "../word/Drawing/Overlay.js",
+                "../common/Overlay.js",
                 "../slide/Drawing/HtmlPage.js",
                 "../slide/Drawing/DrawingDocument.js"
             ],

build/configs/webword.json

 {
     "info": {
-        "version": "3.7.0",
+        "version": "3.8.0",
         "build": 167
     },
     "update_src": {
@@ -103,7 +103,7 @@
                 "../word/Editor/FontClassification.js",
                 "../word/Editor/Spelling.js",
                 "../word/Drawing/Graphics.js",
-                "../word/Drawing/Overlay.js",
+                "../common/Overlay.js",
                 "../word/Drawing/HatchPattern.js",
                 "../word/Drawing/ShapeDrawer.js",
                 "../word/Drawing/Metafile.js",
@@ -158,8 +158,7 @@
                 "../common/Local/common.js",
                 "../word/Local/api.js"
             ],
-            "exclude_mobile": [
-            ],
+            "exclude_mobile": [],
             "dst": "../word/sdk-all.js",
             "externs": [
                 "../common/Build/Externs.js",

cell/api.js

@@ -857,6 +857,9 @@ var editor;
     oAdditionalData["vkey"] = this.documentVKey;
     oAdditionalData["outputformat"] = sFormat;
     oAdditionalData["title"] = changeFileExtention(this.documentTitle, getExtentionByFormat(sFormat));
+    if (DownloadType.Print === options.downloadType) {
+      oAdditionalData["inline"] = 1;
+    }
     if (c_oAscFileType.PDF === sFormat) {
       var printPagesData = this.wb.calcPagesPrint(this.adjustPrint);
       var pdf_writer = new CPdfPrinter();

cell/model/DrawingObjects/DrawingDocument.js

@@ -4891,3 +4891,25 @@ function CDrawingDocument(drawingObjects)
             this.m_oWordControl.MobileTouchManager.CheckSelectEnd(false);
     }
 }
+
+// заглушка
+function CHtmlPage()
+{
+    this.drawingPage = { top: 0, left: 0, right: 0, bottom: 0 };
+    this.width_mm = 0;
+    this.height_mm = 0;
+}
+
+CHtmlPage.prototype.init = function(x, y, w_pix, h_pix, w_mm, h_mm) {
+    this.drawingPage.top = y;
+    this.drawingPage.left = x;
+    this.drawingPage.right = w_pix;
+    this.drawingPage.bottom = h_pix;
+    this.width_mm = w_mm;
+    this.height_mm = h_mm;
+};
+
+CHtmlPage.prototype.GetDrawingPageInfo = function() {
+
+    return { drawingPage: this.drawingPage, width_mm: this.width_mm, height_mm: this.height_mm };
+};
\ No newline at end of file

common/Charts/DrawingArea.js

@@ -560,7 +560,7 @@ function FrozenPlace(ws, type) {
 		_this.restore(canvas.shapeCtx);
 	};
 	
-	_this.setTransform = function(shapeCtx, shapeOverlayCtx, autoShapeTrack) {
+	_this.setTransform = function(shapeCtx, shapeOverlayCtx, autoShapeTrack, trackOverlay) {
 		
 		if ( shapeCtx && shapeOverlayCtx && autoShapeTrack ) {
 			
@@ -580,6 +580,15 @@ function FrozenPlace(ws, type) {
 			autoShapeTrack.Graphics.CalculateFullTransform();
             _this.worksheet.objectRender.controller.recalculateCurPos();
 		}
+        if(trackOverlay && trackOverlay.m_oHtmlPage)
+        {
+            var width = trackOverlay.m_oHtmlPage.drawingPage.right -  trackOverlay.m_oHtmlPage.drawingPage.left;
+            var height = trackOverlay.m_oHtmlPage.drawingPage.bottom -  trackOverlay.m_oHtmlPage.drawingPage.top;
+            trackOverlay.m_oHtmlPage.drawingPage.left = x;
+            trackOverlay.m_oHtmlPage.drawingPage.top  = y;
+            trackOverlay.m_oHtmlPage.drawingPage.right = x + width;
+            trackOverlay.m_oHtmlPage.drawingPage.bottom  = y + height;
+        }
 	};
 	
 	// Range constructor	
@@ -682,7 +691,7 @@ DrawingArea.prototype.drawSelection = function(drawingDocument) {
     }
     for ( var i = 0; i < this.frozenPlaces.length; i++ ) {
 
-        this.frozenPlaces[i].setTransform(shapeCtx, shapeOverlayCtx, autoShapeTrack);
+        this.frozenPlaces[i].setTransform(shapeCtx, shapeOverlayCtx, autoShapeTrack, trackOverlay);
 
         // Clip
         this.frozenPlaces[i].clip(shapeOverlayCtx);

common/Drawings/Format/Shape.js

@@ -3829,7 +3829,7 @@ CShape.prototype =
         {
             var clip_rect = this.clipRect;
             var oBodyPr = this.getBodyPr();
-            if(!oBodyPr || oBodyPr.upright)
+            if(!oBodyPr || !oBodyPr.upright)
             {
                 graphics.transform3(this.transform);
                 graphics.AddClipRect(clip_rect.x, clip_rect.y, clip_rect.w, clip_rect.h);

slide/api.js

@@ -4738,6 +4738,9 @@ function _downloadAs(editor, filetype, actionType, options)
 	oAdditionalData["outputformat"] = filetype;
 	oAdditionalData["title"] = changeFileExtention(editor.documentTitle, getExtentionByFormat(filetype));
 	oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll;
+    if (DownloadType.Print === options.downloadType) {
+      oAdditionalData["inline"] = 1;
+    }
 	if(c_oAscFileType.PDF == filetype)
 	{
 		var dd = editor.WordControl.m_oDrawingDocument;

word/api.js

@@ -6733,6 +6733,9 @@ function _downloadAs(editor, command, filetype, actionType, options, fCallbackRe
     oAdditionalData["outputformat"] = filetype;
     oAdditionalData["title"] = changeFileExtention(editor.documentTitle, getExtentionByFormat(filetype));
 	oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll;
+    if (DownloadType.Print === options.downloadType) {
+      oAdditionalData["inline"] = 1;
+    }
 	if (options.isNoData) {
 		;//nothing
 	} else if (null == options.oDocumentMailMerge &&  c_oAscFileType.PDF === filetype) {