[Libreoffice-commits] core.git: sc/source
Eike Rathke
erack at redhat.com
Tue Apr 18 20:26:07 UTC 2017
sc/source/core/data/document10.cxx | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
New commits:
commit 840ac578dc5c21731b927bad6113839c4c69c108
Author: Eike Rathke <erack at redhat.com>
Date: Tue Apr 18 22:24:03 2017 +0200
only handling copy&paste needed, cut&paste bailed out, tdf#105245 follow-up
Change-Id: I946d9f09e7571d347111ad66326ab375d153e298
diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx
index bae227dbb3a0..c5bc3118a174 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -130,19 +130,9 @@ bool ScDocument::CopyOneCellFromClip(
aRefCxt.mnColDelta = nCol1 - aSrcPos.Col();
aRefCxt.mnRowDelta = nRow1 - aSrcPos.Row();
aRefCxt.mnTabDelta = rCxt.getTabStart() - aSrcPos.Tab();
- if (rCxt.getClipDoc()->GetClipParam().mbCutMode)
- {
- if (rCxt.getClipDoc()->GetPool() == GetPool())
- {
- aRefCxt.meMode = URM_MOVE;
- UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
- }
- }
- else
- {
- aRefCxt.meMode = URM_COPY;
- UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
- }
+ // Only Copy&Paste, for Cut&Paste we already bailed out early.
+ aRefCxt.meMode = URM_COPY;
+ UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
return true;
}
More information about the Libreoffice-commits
mailing list