Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1671
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/1671/1
fdo#56098 Paste Special options after cut incorrect
Change-Id: Icf6aa698e69a2271cf68f420ceaec4aaffe94ad0
---
M sc/source/ui/view/cellsh1.cxx
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 6d434ce..82f969c 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1271,18 +1271,15 @@
{
SCCOL nPosX = pData->GetCurX();
SCROW nPosY = pData->GetCurY();
- SCCOL nClipStartX, nClipSizeX;
- SCROW nClipStartY, nClipSizeY;
- pOwnClip->GetDocument()->GetClipStart(
nClipStartX, nClipStartY );
+ SCCOL nClipSizeX;
+ SCROW nClipSizeY;
// for CutMode, filtered rows can
always be included
pOwnClip->GetDocument()->GetClipArea(
nClipSizeX, nClipSizeY, sal_True );
int nDisableShift = 0;
- if ( nClipStartX <= nPosX + nClipSizeX
&&
- nPosX <= nClipStartX +
nClipSizeX )
+ if ( nPosX + 2 * nClipSizeX + 1 >
MAXCOL ) // fdo#56098
+ nDisableShift |=
SC_CELL_SHIFT_DISABLE_RIGHT;
+ if ( nPosY + 2 * nClipSizeY + 1 >
MAXROW ) // fdo#56098
nDisableShift |=
SC_CELL_SHIFT_DISABLE_DOWN;
- if ( nClipStartY <= nPosY + nClipSizeY
&&
- nPosY <= nClipStartY +
nClipSizeY )
- nDisableShift |=
SC_CELL_SHIFT_DISABLE_RIGHT;
if ( nDisableShift )
pDlg->SetCellShiftDisabled(
nDisableShift );
}
--
To view, visit https://gerrit.libreoffice.org/1671
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf6aa698e69a2271cf68f420ceaec4aaffe94ad0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Winfried Donkers <o...@dci-electronics.nl>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
