diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-02-27 01:55:24 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-02-27 11:33:52 +0000 |
| commit | 9cdd64ca1e409106fad554d7823ae57e2d2e009c (patch) | |
| tree | 99d54ac665ee1d1eb3d95654419c1c9e7980a155 | |
| parent | 160c0f4c1fd381a91a7443088c7222ae4cc5b6a2 (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
Reviewed-on: https://gerrit.libreoffice.org/2435
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Reviewed-on: https://gerrit.libreoffice.org/2439
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
| -rw-r--r-- | sc/source/core/data/table2.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 1127f5274e24..936e5970caac 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -739,6 +739,17 @@ 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]); + + if(nInsFlag != IDF_OBJECTS) + { + // 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); |