Commit 3177eab3 authored by alexey.musinov's avatar alexey.musinov

fix Bug 32816

parent 5dde163a
...@@ -1897,44 +1897,49 @@ Asc['asc_docs_api'].prototype["Call_Menu_Event"] = function(type, _params) ...@@ -1897,44 +1897,49 @@ Asc['asc_docs_api'].prototype["Call_Menu_Event"] = function(type, _params)
case 21: case 21:
{ {
var bIsNeed = _params[_current.pos++]; var bIsNeed = _params[_current.pos++];
if (bIsNeed) if (bIsNeed)
{ {
var _originSize = this.WordControl.m_oDrawingDocument.Native["DD_GetOriginalImageSize"](_imagePr.ImageUrl); var currImage = this.WordControl.m_oLogicDocument.DrawingObjects.Get_Props();
var _w = _originSize[0]; if (currImage && currImage.length) {
var _h = _originSize[1];
var _originSize = this.WordControl.m_oDrawingDocument.Native["DD_GetOriginalImageSize"](currImage[0].ImageUrl);
// сбрасываем урл
_imagePr.ImageUrl = undefined; var _w = _originSize[0];
var _h = _originSize[1];
var _section_select = this.WordControl.m_oLogicDocument.Get_PageSizesByDrawingObjects();
var _page_width = AscCommon.Page_Width; // сбрасываем урл
var _page_height = AscCommon.Page_Height; _imagePr.ImageUrl = undefined;
var _page_x_left_margin = AscCommon.X_Left_Margin;
var _page_y_top_margin = AscCommon.Y_Top_Margin; var _section_select = this.WordControl.m_oLogicDocument.Get_PageSizesByDrawingObjects();
var _page_x_right_margin = AscCommon.X_Right_Margin; var _page_width = AscCommon.Page_Width;
var _page_y_bottom_margin = AscCommon.Y_Bottom_Margin; var _page_height = AscCommon.Page_Height;
var _page_x_left_margin = AscCommon.X_Left_Margin;
if (_section_select) var _page_y_top_margin = AscCommon.Y_Top_Margin;
{ var _page_x_right_margin = AscCommon.X_Right_Margin;
if (_section_select.W) var _page_y_bottom_margin = AscCommon.Y_Bottom_Margin;
_page_width = _section_select.W;
if (_section_select)
if (_section_select.H) {
_page_height = _section_select.H; if (_section_select.W)
_page_width = _section_select.W;
if (_section_select.H)
_page_height = _section_select.H;
}
var __w = Math.max(1, _page_width - (_page_x_left_margin + _page_x_right_margin));
var __h = Math.max(1, _page_height - (_page_y_top_margin + _page_y_bottom_margin));
var wI = (undefined !== _w) ? Math.max(_w * AscCommon.g_dKoef_pix_to_mm, 1) : 1;
var hI = (undefined !== _h) ? Math.max(_h * AscCommon.g_dKoef_pix_to_mm, 1) : 1;
wI = Math.max(5, Math.min(wI, __w));
hI = Math.max(5, Math.min(hI, __h));
_imagePr.Width = wI;
_imagePr.Height = hI;
} }
var __w = Math.max(1, _page_width - (_page_x_left_margin + _page_x_right_margin));
var __h = Math.max(1, _page_height - (_page_y_top_margin + _page_y_bottom_margin));
var wI = (undefined !== _w) ? Math.max(_w * AscCommon.g_dKoef_pix_to_mm, 1) : 1;
var hI = (undefined !== _h) ? Math.max(_h * AscCommon.g_dKoef_pix_to_mm, 1) : 1;
wI = Math.max(5, Math.min(wI, __w));
hI = Math.max(5, Math.min(hI, __h));
_imagePr.Width = wI;
_imagePr.Height = hI;
} }
break; break;
......
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