[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source

[Eike Rathke]

 sc/source/core/data/document10.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 5e99baf433a3e3d372979cc74240de5c93f71319
Author: Eike Rathke <erack at redhat.com>
Date:   Mon May 30 18:30:48 2016 +0200

    Resolves: tdf#97158 CopyOneCellFromClip() does not handle multiple sheets
    
    ... so check that and bail out to let the remainder of CopyFromClip()
    handle it.
    
    (cherry picked from commit dc9eac5a5f4f247ba5efb67931ffde61f2c8d5b6)
    9d07f557572bdeaeda8e923525c8895d79fc0d22
    f65b29ff13211449144455668014a80aa8b331a3
    
    Change-Id: I9d139de905fd108ae41fed79a38860058525272c
    Reviewed-on: https://gerrit.libreoffice.org/25682
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx
index 8e1a54b..1a41347 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -81,6 +81,10 @@ bool ScDocument::CopyOneCellFromClip(
     if (nDestColSize < nSrcColSize)
         return false;
 
+    if (pClipDoc->maTabs.size() > 1)
+        // Copying from multiple source sheets is not handled here.
+        return false;
+
     ScAddress aSrcPos = aClipRange.aStart;
 
     for (SCCOL nCol = aClipRange.aStart.Col(); nCol <= aClipRange.aEnd.Col(); ++nCol)