summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-02-19 18:57:18 +0100
committerPetr Mladek <pmladek@suse.cz>2013-02-26 11:36:15 +0000
commit8f5ad437835822cdcb6d46b1c468d7d9ca52e1ea (patch)
tree193d475f15123b32448b304a24cdbbe10c358ce2
parent5cb54fa422f7c29383e0eb429e568856015352db (diff)
automatically extending cond formats is dangerous, fdo#60828
Change-Id: I45549e163f21550e879a171d80e836b6df3dd2cc Reviewed-on: https://gerrit.libreoffice.org/2410 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/2421 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
-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 918a60233128..c3c99b2ca626 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++)
{