Commit c531d119 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Fix Bug 21714 - [Print] Отсутствует текст, введенный в автофигуру или текстовую область

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51309 954022d7-b5bf-4e40-9824-e11837661b57
parent 1c775441
...@@ -3385,8 +3385,13 @@ function DrawingObjects() { ...@@ -3385,8 +3385,13 @@ function DrawingObjects() {
else { else {
var tx = drawingObject.graphicObject.transform.tx; var tx = drawingObject.graphicObject.transform.tx;
var ty = drawingObject.graphicObject.transform.ty; var ty = drawingObject.graphicObject.transform.ty;
var txTxt = drawingObject.graphicObject.transformText.tx;
var tyTxt = drawingObject.graphicObject.transformText.ty;
drawingObject.graphicObject.transform.tx -= left; drawingObject.graphicObject.transform.tx -= left;
drawingObject.graphicObject.transform.ty -= top; drawingObject.graphicObject.transform.ty -= top;
drawingObject.graphicObject.transformText.tx -= left;
drawingObject.graphicObject.transformText.ty -= top;
// Save chart transforms // Save chart transforms
var chartTxtAreas = []; var chartTxtAreas = [];
...@@ -3415,6 +3420,8 @@ function DrawingObjects() { ...@@ -3415,6 +3420,8 @@ function DrawingObjects() {
// Restore // Restore
drawingObject.graphicObject.transform.tx = tx; drawingObject.graphicObject.transform.tx = tx;
drawingObject.graphicObject.transform.ty = ty; drawingObject.graphicObject.transform.ty = ty;
drawingObject.graphicObject.transformText.tx = txTxt;
drawingObject.graphicObject.transformText.ty = tyTxt;
} }
if ( printPagesData.pageHeadings ) { if ( printPagesData.pageHeadings ) {
worksheet._drawColumnHeaders(printOptions.ctx, range.c1, range.c2, /*style*/ undefined, worksheet.cols[range.c1].left - printPagesData.leftFieldInPt + offsetCols, printPagesData.topFieldInPt - worksheet.cellsTop); worksheet._drawColumnHeaders(printOptions.ctx, range.c1, range.c2, /*style*/ undefined, worksheet.cols[range.c1].left - printPagesData.leftFieldInPt + offsetCols, printPagesData.topFieldInPt - worksheet.cellsTop);
......
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