|
Lines 1448-1453
Link Here
|
| 1448 |
SCROW nY = aMarkRange.aEnd.Row(); |
1448 |
SCROW nY = aMarkRange.aEnd.Row(); |
| 1449 |
|
1449 |
|
| 1450 |
Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE ); |
1450 |
Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE ); |
|
|
1451 |
Point OldFillPos = aFillPos; |
| 1451 |
long nSizeXPix; |
1452 |
long nSizeXPix; |
| 1452 |
long nSizeYPix; |
1453 |
long nSizeYPix; |
| 1453 |
pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); |
1454 |
pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); |
|
Lines 1478-1483
Link Here
|
| 1478 |
} |
1479 |
} |
| 1479 |
bNewPointer = TRUE; |
1480 |
bNewPointer = TRUE; |
| 1480 |
} |
1481 |
} |
|
|
1482 |
|
| 1483 |
// select single fill for move |
| 1484 |
else if ( ( ( ( aMousePos.X() >= OldFillPos.X()-2 && aMousePos.X() <= OldFillPos.X()+2 ) || |
| 1485 |
( aMousePos.X() >= aFillPos.X()-2 && aMousePos.X() <= aFillPos.X()+2 ) ) && |
| 1486 |
( aMousePos.Y() >= OldFillPos.Y()-2 && aMousePos.Y() <= aFillPos.Y()+2 ) ) || |
| 1487 |
( ( ( aMousePos.Y() >= OldFillPos.Y()-2 && aMousePos.Y() <= OldFillPos.Y()+2 ) || |
| 1488 |
( aMousePos.Y() >= aFillPos.Y()-2 && aMousePos.Y() <= aFillPos.Y()+2 ) ) && |
| 1489 |
( aMousePos.X() >= OldFillPos.X()-2 && aMousePos.X() <= aFillPos.X()+2 ) ) ) |
| 1490 |
{ |
| 1491 |
SetPointer( Pointer( POINTER_MOVE ) ); |
| 1492 |
|
| 1493 |
// only action from mouse down |
| 1494 |
if (bAction) |
| 1495 |
{ |
| 1496 |
// set mark cursor |
| 1497 |
ScViewFunc* pView = pViewData->GetView(); |
| 1498 |
pView->DoneBlockMode(); |
| 1499 |
pView->InitBlockMode( nX, nY, nTab ); |
| 1500 |
pView->MarkCursor( nX, nY, nTab, FALSE, FALSE, TRUE ); |
| 1501 |
pView->CursorPosChanged(); |
| 1502 |
} |
| 1503 |
} |
| 1504 |
|
| 1481 |
} |
1505 |
} |
| 1482 |
} |
1506 |
} |
| 1483 |
|
1507 |
|