[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[Markus Mohrhard]

 sc/source/core/data/table7.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 15443038c4b8d4c1e7d1aa32df72f41ba93b5b8b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Feb 22 22:43:35 2018 +0100

    copy multiple single row cond formats correctly, tdf#115835
    
    Change-Id: Ic20cc27f03edf3dbd27975f99c788bf5bffd4c48
    Reviewed-on: https://gerrit.libreoffice.org/50211
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit c557889748292d25996ea8f587d7564c74e6f121)
    Reviewed-on: https://gerrit.libreoffice.org/50292
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index 6fe30a795fa7..47bcfbd5117f 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -130,10 +130,10 @@ void ScTable::CopyOneCellFromClip(
         assert(nColOffset >= 0);
         aCol[nCol].CopyOneCellFromClip(rCxt, nRow1, nRow2, nColOffset);
 
-        if ((rCxt.getInsertFlag() & InsertDeleteFlags::ATTRIB) && (nColOffset == 0))
+        if (rCxt.getInsertFlag() & InsertDeleteFlags::ATTRIB)
         {
             for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
-                CopyConditionalFormat(nCol, nRow, nCol + nSrcColSize - 1, nRow, nCol - aSrcRange.aStart.Col(),
+                CopyConditionalFormat(nCol, nRow, nCol, nRow, nCol - aSrcRange.aStart.Col() - nColOffset,
                         nRow - nSrcRow, pSrcTab);
         }
     }