summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-02-27 01:55:24 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-02-27 02:01:11 +0100
commit9c77890a165a1a00441245fd6f8703d8911bc075 (patch)
treedd977aa1109c321d99ce71dceab470dd4d12f7f6
parent9b16031c5e3197bf685703bf236e53b5910b4f70 (diff)
remove the copied cond format cell attr entries, fdo#60306
The old exisiting conditional format entries in the ScAttrArray will not be overwritten in 4.0 so that we might have gotten a wrong conditional format before our existing conditional format. Change-Id: Ib619f6a1b335e9bbdffc8b518fe41b729775d24c
-rw-r--r--sc/source/core/data/table2.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 4add7ef75f61..4d32cb3a0c41 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -739,6 +739,14 @@ void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
for ( SCCOL i = nCol1; i <= nCol2; i++)
aCol[i].CopyFromClip(nRow1, nRow2, nDy, nInsFlag, bAsLink, bSkipAttrForEmpty, pTable->aCol[i - nDx]);
+
+ // make sure that there are no old references to the cond formats
+ sal_uInt16 nWhichArray[2];
+ nWhichArray[0] = ATTR_CONDITIONAL;
+ nWhichArray[1] = 0;
+ for ( SCCOL i = nCol1; i <= nCol2; ++i)
+ aCol[i].ClearItems(nRow1, nRow2, nWhichArray);
+
//remove old notes
if (nInsFlag & (IDF_NOTE|IDF_ADDNOTES))
maNotes.erase(nCol1, nRow1, nCol2, nRow2);