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

[Markus Mohrhard]

 sc/source/core/data/table2.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8f5ad437835822cdcb6d46b1c468d7d9ca52e1ea
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Feb 19 18:57:18 2013 +0100

    automatically extending cond formats is dangerous, fdo#60828
    
    Change-Id: I45549e163f21550e879a171d80e836b6df3dd2cc
    Reviewed-on: https://gerrit.libreoffice.org/2410
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-on: https://gerrit.libreoffice.org/2421
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 918a602..c3c99b2 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -389,9 +389,10 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
 
     if (nStartCol>0)                        // copy old attributes
     {
-        sal_uInt16 nWhichArray[2];
+        sal_uInt16 nWhichArray[3];
         nWhichArray[0] = ATTR_MERGE;
-        nWhichArray[1] = 0;
+        nWhichArray[1] = ATTR_CONDITIONAL;
+        nWhichArray[2] = 0;
 
         for (SCSIZE i=0; i<nSize; i++)
         {