[PATCH libreoffice-4-0-1] remove the copied cond format cell attr entries, fdo#60306

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2439

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/2439/1

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>
---
M sc/source/core/data/table2.cxx
1 file changed, 11 insertions(+), 0 deletions(-)



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 @@
         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);

-- 
To view, visit https://gerrit.libreoffice.org/2439
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib619f6a1b335e9bbdffc8b518fe41b729775d24c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-1
Gerrit-Owner: Petr Mladek <pmladek@suse.cz>
Gerrit-Reviewer: Markus Mohrhard <markus.mohrhard@googlemail.com>