Commit 5768fc56 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61478 954022d7-b5bf-4e40-9824-e11837661b57
parent a31ffaad
...@@ -1042,6 +1042,12 @@ function asc_menu_WriteParaFrame(_type, _frame, _stream) ...@@ -1042,6 +1042,12 @@ function asc_menu_WriteParaFrame(_type, _frame, _stream)
asc_docs_api.prototype["Call_Menu_Event"] = function(type, _params) asc_docs_api.prototype["Call_Menu_Event"] = function(type, _params)
{ {
if (this.m_oWordControl.m_oDrawingDocument.m_bIsMouseLock)
{
// не делаем ничего. Как в веб версии отрубаем клавиатуру
return undefined;
}
var _return = undefined; var _return = undefined;
var _current = { pos : 0 }; var _current = { pos : 0 };
var _continue = true; var _continue = true;
...@@ -4523,8 +4529,8 @@ asc_docs_api.prototype.AddImageUrlNative = function(url, _w, _h) ...@@ -4523,8 +4529,8 @@ asc_docs_api.prototype.AddImageUrlNative = function(url, _w, _h)
_page_height = _section_select.H; _page_height = _section_select.H;
} }
var __w = Math.max(1, _page_width - (_page_x_left_margin + _page_x_right_margin)); var __w = Math.max(1, (_page_width - (_page_x_left_margin + _page_x_right_margin)) / 2);
var __h = Math.max(1, _page_height - (_page_y_top_margin + _page_y_bottom_margin)); var __h = Math.max(1, (_page_height - (_page_y_top_margin + _page_y_bottom_margin)) / 2);
var wI = (undefined !== _w) ? Math.max(_w * g_dKoef_pix_to_mm, 1) : 1; var wI = (undefined !== _w) ? Math.max(_w * g_dKoef_pix_to_mm, 1) : 1;
var hI = (undefined !== _h) ? Math.max(_h * g_dKoef_pix_to_mm, 1) : 1; var hI = (undefined !== _h) ? Math.max(_h * g_dKoef_pix_to_mm, 1) : 1;
......
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