Commit c7f5c67a authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил баг http://bugzserver/show_bug.cgi?id=26072 с печатью (нужно...

Поправил баг http://bugzserver/show_bug.cgi?id=26072 с печатью (нужно доделать, чтобы не менялся видимый диапазон).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57930 954022d7-b5bf-4e40-9824-e11837661b57
parent ada61ccf
......@@ -2293,16 +2293,14 @@
}
if (!drawingCtx) {
ctx = (undefined === drawingCtx) ? this.drawingCtx : drawingCtx;
left = this.cols[range.c1].left;
top = this.rows[range.r1].top;
// set clipping rect to cells area
ctx.save()
this.drawingCtx.save()
.beginPath()
.rect(left - offsetX, top - offsetY,
Math.min(this.cols[range.c2].left - left + this.cols[range.c2].width, ctx.getWidth() - this.cellsLeft),
Math.min(this.rows[range.r2].top - top + this.rows[range.r2].height, ctx.getHeight() - this.cellsTop))
Math.min(this.cols[range.c2].left - left + this.cols[range.c2].width, this.drawingCtx.getWidth() - this.cellsLeft),
Math.min(this.rows[range.r2].top - top + this.rows[range.r2].height, this.drawingCtx.getHeight() - this.cellsTop))
.clip();
}
......@@ -2311,7 +2309,7 @@
if (!drawingCtx) {
// restore canvas' original clipping range
ctx.restore();
this.drawingCtx.restore();
}
};
......@@ -4084,7 +4082,7 @@
* @param {Asc.Range} [range] Диапазон кэширования текта
*/
WorksheetView.prototype._prepareCellTextMetricsCache = function (range) {
var firstUpdateRow = null, tmp = null;
var firstUpdateRow = null;
if (!range) {
range = this.visibleRange;
if (this.topLeftFrozenCell) {
......@@ -4121,10 +4119,8 @@
* @param {Asc.Range} [range] Диапазон кэширования текта
*/
WorksheetView.prototype._prepareCellTextMetricsCache2 = function (range) {
var s = this.cache.sectors;
if (s.length < 1) {return;}
var firstUpdateRow = null;
var s = this.cache.sectors;
for (var i = 0; i < s.length; ) {
if (s[i].isIntersect(range)) {
this._calcCellsTextMetrics(s[i]);
......
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