sc/inc/document.hxx | 2 +-
sc/source/core/data/document.cxx | 2 +-
sc/source/core/data/document10.cxx | 7 +++----
3 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 9d07f557572bdeaeda8e923525c8895d79fc0d22
Author: Eike Rathke <er...@redhat.com>
Date: Mon May 30 20:04:25 2016 +0200
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
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 01eadaf..5696f26 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 af943d4..68b1f8f 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 e99d0b4..6363265 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
