Commit 31e9a40f authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

pageIndex textcontent (shape->image)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50928 954022d7-b5bf-4e40-9824-e11837661b57
parent dcb1d507
window.IsShapeToImageConverter = false;
function DrawLineEnd(xEnd, yEnd, xPrev, yPrev, type, w, len, drawer, trans)
{
switch (type)
......@@ -1651,6 +1652,7 @@ CShapeDrawer.prototype =
function ShapeToImageConverter(shape, pageIndex)
{
window.IsShapeToImageConverter = true;
var _bounds_cheker = new CSlideBoundsChecker();
var dKoef = g_dKoef_mm_to_pix;
......@@ -1663,7 +1665,7 @@ function ShapeToImageConverter(shape, pageIndex)
_bounds_cheker.transform(1,0,0,1,0,0);
_bounds_cheker.AutoCheckLineWidth = true;
shape.draw(_bounds_cheker, pageIndex);
shape.draw(_bounds_cheker, /*pageIndex*/0);
var _need_pix_width = _bounds_cheker.Bounds.max_x - _bounds_cheker.Bounds.min_x + 1;
var _need_pix_height = _bounds_cheker.Bounds.max_y - _bounds_cheker.Bounds.min_y + 1;
......@@ -1699,7 +1701,9 @@ function ShapeToImageConverter(shape, pageIndex)
g.m_oCoordTransform.ty = -_bounds_cheker.Bounds.min_y;
g.transform(1,0,0,1,0,0);
shape.draw(g, pageIndex);
shape.draw(g, /*pageIndex*/0);
window.IsShapeToImageConverter = false;
var _ret = { ImageNative : _canvas, ImageUrl : "" };
try
......
......@@ -811,6 +811,12 @@ CChartTitle.prototype =
{
graphics.SetIntegerGrid(false);
graphics.transform3(this.transformText);
if (window.IsShapeToImageConverter)
{
pageIndex = 0;
}
this.txBody.draw(graphics, pageIndex);
graphics.reset();
graphics.SetIntegerGrid(true);
......
......@@ -2099,6 +2099,12 @@ WordShape.prototype =
if (graphics.CheckUseFonts2 !== undefined)
graphics.CheckUseFonts2(this.transformText);
if (window.IsShapeToImageConverter)
{
this.textBoxContent.Set_StartPage(0);
result_page_index = 0;
}
this.textBoxContent.Draw(result_page_index, graphics);
if (graphics.UncheckUseFonts2 !== undefined)
......
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