Commit ca0cbd82 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

Bug 27009 - Снятие стиля/заливки с диапазона ячеек после применения к ним Copy...

Bug 27009 - Снятие стиля/заливки с диапазона ячеек после применения к ним Copy Style граничащего с ним диапазона

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58813 954022d7-b5bf-4e40-9824-e11837661b57
parent 49d5cf7b
...@@ -7292,6 +7292,11 @@ Range.prototype._canPromote=function(from, to, bIsPromote, nWidth, nHeight, bVer ...@@ -7292,6 +7292,11 @@ Range.prototype._canPromote=function(from, to, bIsPromote, nWidth, nHeight, bVer
return oRes; return oRes;
}; };
Range.prototype.promoteFromTo=function(from, to){ Range.prototype.promoteFromTo=function(from, to){
if(to.isOneCell())
{
to = to.clone();
to.setOffsetLast({offsetCol: (from.c2 - from.c1) - (to.c2 - to.c1), offsetRow: (from.r2 - from.r1) - (to.r2 - to.r1)});
}
if(!from.isIntersect(to)) if(!from.isIntersect(to))
{ {
var bFromWholeCol = (0 == from.c1 && gc_nMaxCol0 == from.c2); var bFromWholeCol = (0 == from.c1 && gc_nMaxCol0 == from.c2);
...@@ -7300,11 +7305,6 @@ Range.prototype.promoteFromTo=function(from, to){ ...@@ -7300,11 +7305,6 @@ Range.prototype.promoteFromTo=function(from, to){
var bToWholeRow = (0 == to.r1 && gc_nMaxRow0 == to.r2); var bToWholeRow = (0 == to.r1 && gc_nMaxRow0 == to.r2);
if(((bFromWholeCol && bToWholeCol) == (bFromWholeCol || bToWholeCol)) && ((bFromWholeRow && bToWholeRow) == (bFromWholeRow || bToWholeRow))) if(((bFromWholeCol && bToWholeCol) == (bFromWholeCol || bToWholeCol)) && ((bFromWholeRow && bToWholeRow) == (bFromWholeRow || bToWholeRow)))
{ {
if(to.isOneCell())
{
to = to.clone();
to.setOffsetLast({offsetCol: (from.c2 - from.c1) - (to.c2 - to.c1), offsetRow: (from.r2 - from.r1) - (to.r2 - to.r1)});
}
var bVertical = true; var bVertical = true;
var nIndex = 1; var nIndex = 1;
//проверяем можно ли осуществить promote //проверяем можно ли осуществить promote
......
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