diff options
| author | Eike Rathke <erack@redhat.com> | 2016-05-30 20:04:25 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-05-30 18:53:26 +0000 |
| commit | dd38581b787f357ee88da7dfabeb596a894b5afe (patch) | |
| tree | ea93e501ccf20fbac682eb8762b46708c386d828 | |
| parent | 130e4ceeca3aa8382984629c8a7bc639c118deaf (diff) | |
actually multiple destination sheets are handled, tdf#97158 follow-up
... so ScMarkData doesn't need to be passed. Which it wasn't anyway
because the destination sheet span is part of CopyFromClipContext.
Change-Id: I0addd370d96ab78b22ed957081a1212fc70419a1
(cherry picked from commit 9d07f557572bdeaeda8e923525c8895d79fc0d22)
Reviewed-on: https://gerrit.libreoffice.org/25685
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | sc/inc/document.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/document.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/document10.cxx | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 01eadaf9fc1c..5696f260f789 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1419,7 +1419,7 @@ public: sc::CopyFromClipContext& rCxt, const ScMarkData& rMark, sc::ColumnSpanSet& rBroadcastSpans ); bool CopyOneCellFromClip( - sc::CopyFromClipContext& rCxt, const ScMarkData& rMark, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); + sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); void CopyBlockFromClip( sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy ); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 224908de5a55..f5ad18c25d6f 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -2806,7 +2806,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar else DeleteArea(nCol1, nRow1, nCol2, nRow2, rMark, nDelFlag, false, &aBroadcastSpans); - if (CopyOneCellFromClip(aCxt, rMark, nCol1, nRow1, nCol2, nRow2)) + if (CopyOneCellFromClip(aCxt, nCol1, nRow1, nCol2, nRow2)) continue; SCCOL nC1 = nCol1; diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx index e99d0b4c39b0..63632655d2fc 100644 --- a/sc/source/core/data/document10.cxx +++ b/sc/source/core/data/document10.cxx @@ -65,7 +65,7 @@ void ScDocument::DeleteBeforeCopyFromClip( } bool ScDocument::CopyOneCellFromClip( - sc::CopyFromClipContext& rCxt, const ScMarkData& rMark, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) + sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { ScDocument* pClipDoc = rCxt.getClipDoc(); if (pClipDoc->GetClipParam().mbCutMode) @@ -82,9 +82,8 @@ bool ScDocument::CopyOneCellFromClip( if (nDestColSize < nSrcColSize) return false; - if (rCxt.getClipDoc()->maTabs.size() > 1 || rMark.GetSelectCount() > 1) - // Copying from multiple source sheets or to multiple destination - // sheets is not handled here. + if (rCxt.getClipDoc()->maTabs.size() > 1) + // Copying from multiple source sheets is not handled here. return false; ScAddress aSrcPos = aClipRange.aStart; |