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

Фрагменты нужно копировать при "копировании"

При вставке вставляем уже не преобразовывая цвет (для локального буфера)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52073 954022d7-b5bf-4e40-9824-e11837661b57
parent 82ae2d8e
...@@ -2448,9 +2448,14 @@ ...@@ -2448,9 +2448,14 @@
} }
if(t.lStorage[row] == undefined) if(t.lStorage[row] == undefined)
t.lStorage[row] = []; t.lStorage[row] = [];
var arrFragmentsTmp = cell.getValue2();
var arrFragments = [];
for (var i = 0; i < arrFragmentsTmp.length; ++i) {
arrFragments.push(arrFragmentsTmp[i].clone());
}
t.lStorage[row][col] = t.lStorage[row][col] =
{ {
value2: Asc.clone(cell.getValue2()), value2: arrFragments,
borders: cell.getBorderFull(), borders: cell.getBorderFull(),
merge: cell.hasMerged(), merge: cell.hasMerged(),
format: cell.getNumFormat(), format: cell.getNumFormat(),
......
...@@ -7741,8 +7741,8 @@ ...@@ -7741,8 +7741,8 @@
range.setBold(newVal.value2[numStyle].format.b); range.setBold(newVal.value2[numStyle].format.b);
range.setItalic(newVal.value2[numStyle].format.i); range.setItalic(newVal.value2[numStyle].format.i);
range.setStrikeout(newVal.value2[numStyle].format.s); range.setStrikeout(newVal.value2[numStyle].format.s);
if(!isOneMerge && newVal.value2[numStyle].format && newVal.value2[numStyle].format.c != null && newVal.value2[numStyle].format.c != undefined) if(!isOneMerge && newVal.value2[numStyle].format && null != newVal.value2[numStyle].format.c)
range.setFontcolor(new RgbColor(asc_parsecolor(newVal.value2[numStyle].format.c).binary)); range.setFontcolor(newVal.value2[numStyle].format.c);
range.setUnderline(newVal.value2[numStyle].format.u); range.setUnderline(newVal.value2[numStyle].format.u);
//range.setAlignVertical(currentObj.va); //range.setAlignVertical(currentObj.va);
range.setFontname(newVal.value2[numStyle].format.fn); range.setFontname(newVal.value2[numStyle].format.fn);
......
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