summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2018-02-22 22:43:35 +0100
committerMichael Meeks <michael.meeks@collabora.com>2018-03-15 16:49:02 +0100
commit15443038c4b8d4c1e7d1aa32df72f41ba93b5b8b (patch)
tree1abd726a13ce731f051b70d85fb92ab0ac8bea5a
parent31be192f9a6aee02cf05394dfdb4f18b40413bdc (diff)
copy multiple single row cond formats correctly, tdf#115835
Change-Id: Ic20cc27f03edf3dbd27975f99c788bf5bffd4c48 Reviewed-on: https://gerrit.libreoffice.org/50211 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit c557889748292d25996ea8f587d7564c74e6f121) Reviewed-on: https://gerrit.libreoffice.org/50292 Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r--sc/source/core/data/table7.cxx4
1 files changed, 2 insertions, 2 deletions
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);
}
}