summaryrefslogtreecommitdiffstats
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-02-19 18:57:18 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-02-20 16:28:26 +0100
commit2bc95ebcb9ac66b32ea03f3ccd5996304e910fa1 (patch)
tree0b3b647a7dc57bd8418c205db301960cfe95905c /sc
parentcoverity: passing by const reference is more efficient (diff)
downloadcore-2bc95ebcb9ac66b32ea03f3ccd5996304e910fa1.tar.gz
core-2bc95ebcb9ac66b32ea03f3ccd5996304e910fa1.zip
automatically extending cond formats is dangerous, fdo#60828
Change-Id: I45549e163f21550e879a171d80e836b6df3dd2cc
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/table2.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 23b7a9a60000..97bd3756fcd5 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++)
{