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

[Markus Mohrhard]

 sc/source/core/data/table2.cxx |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 9cdd64ca1e409106fad554d7823ae57e2d2e009c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Feb 27 01:55:24 2013 +0100

    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 at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>
    Reviewed-on: https://gerrit.libreoffice.org/2439
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 1127f52..936e597 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);