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

[Markus Mohrhard]

 sc/source/core/data/document10.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 1e40b728c647b0539f4c60c84fada638285a9bd5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Sep 19 17:18:21 2016 +0200

    tdf#100393, handle copying one cell to multiple cols with cond format
    
    The same fix has been applied for rows already.
    
    Change-Id: I77300680a657fb874d07641fbae928eb6c210acd
    (cherry picked from commit 3a9917b66d6820ec9f2844f8292a46d8b0b9180b)
    Reviewed-on: https://gerrit.libreoffice.org/29033
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx
index 0530566..f5421bd 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -126,8 +126,11 @@ bool ScDocument::CopyOneCellFromClip(
         if (rCxt.getInsertFlag() & InsertDeleteFlags::ATTRIB)
             for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
             {
-                maTabs[i]->CopyConditionalFormat(nCol1, nRow, nCol2, nRow, nCol1 - aClipRange.aStart.Col(),
-                        nRow - aClipRange.aStart.Row(), pSrcTab);
+                for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
+                {
+                    maTabs[i]->CopyConditionalFormat(nCol, nRow, nCol, nRow, nCol - aClipRange.aStart.Col(),
+                            nRow - aClipRange.aStart.Row(), pSrcTab);
+                }
             }
     }