Commit af91642e authored by alexey.musinov's avatar alexey.musinov

Merge branch 'mobile-develop' into develop

parents 41cff84a 639abac7
......@@ -5285,11 +5285,7 @@ CStylesPainter.prototype =
var dKoefToMM = AscCommon.g_dKoef_pix_to_mm;
if (AscCommon.AscBrowser.isRetina)
{
_w_px *= 2;
_h_px *= 2;
dKoefToMM /= 2;
}
_api.WordControl.m_oDrawingDocument.Native["DD_StartNativeDraw"](_w_px, _h_px, _w_px * dKoefToMM, _h_px * dKoefToMM);
......
......@@ -594,7 +594,9 @@ window.clearInterval = clearInterval;
window.setInterval = setInterval;
var console = {
log : function(param) { window.native.ConsoleLog(param); }
log : function(param) { window.native.ConsoleLog(param); },
time : function(param) {},
timeEnd : function(param) {}
};
window["NativeCorrectImageUrlOnPaste"] = function(url) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment