Commit b590da6a authored by GoshaZotov's avatar GoshaZotov

fix bug 33075

parent 24f2ee4a
...@@ -5297,7 +5297,9 @@ PasteProcessor.prototype = ...@@ -5297,7 +5297,9 @@ PasteProcessor.prototype =
var dMaxSum = 0; var dMaxSum = 0;
var nCurColWidth = 0; var nCurColWidth = 0;
var nCurSum = 0; var nCurSum = 0;
var nAllSum = 0;
var oRowSpans = {}; var oRowSpans = {};
var columnSize = this.oLogicDocument ? this.oLogicDocument.GetColumnSize() : null;
var fParseSpans = function() var fParseSpans = function()
{ {
var spans = oRowSpans[nCurColWidth]; var spans = oRowSpans[nCurColWidth];
...@@ -5361,6 +5363,7 @@ PasteProcessor.prototype = ...@@ -5361,6 +5363,7 @@ PasteProcessor.prototype =
nCurColWidth += nColSpan; nCurColWidth += nColSpan;
} }
} }
nAllSum += nCurSum;
fParseSpans(); fParseSpans();
//������� ������ rowspan //������� ������ rowspan
if(nMinRowSpanCount > 1) if(nMinRowSpanCount > 1)
...@@ -5426,7 +5429,16 @@ PasteProcessor.prototype = ...@@ -5426,7 +5429,16 @@ PasteProcessor.prototype =
{ {
var nDif = nCurIndex - nPrevIndex; var nDif = nCurIndex - nPrevIndex;
if(1 == nDif) if(1 == nDif)
aGrid.push(nCurWidth); {
if(!nCurWidth && !nAllSum && columnSize)
{
aGrid.push(columnSize.W / nMaxColCount);
}
else
{
aGrid.push(nCurWidth);
}
}
else else
{ {
var nPartVal = nCurWidth / nDif; var nPartVal = nCurWidth / nDif;
......
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